From 407c1e479988044cc6ff2ce1dc058ebd75a0f205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Mon, 30 Mar 2015 22:07:27 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9sormais,=20"quota2"=20est=20un=20peu=20p?=
 =?UTF-8?q?lus=20propre.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/quota.py  | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 utils/quota2.py | 52 ---------------------------------------------
 2 files changed, 56 insertions(+), 52 deletions(-)
 create mode 100644 utils/quota.py
 delete mode 100644 utils/quota2.py

diff --git a/utils/quota.py b/utils/quota.py
new file mode 100644
index 00000000..f3b39b89
--- /dev/null
+++ b/utils/quota.py
@@ -0,0 +1,56 @@
+# -*- coding: utf8 -*-
+# Reloockage de quota.py, passage à l'intranet 2
+# On retire le sudo par défaut, l'user execute lui meme quota
+# Ecrit il y a longtemps, "dépoussiéré" et "enrichi" par
+# Gabriel Détraz detraz@crans.org
+
+import subprocess
+
+def getFloat(chose):
+    chose = chose.replace(',', '.')
+    return float(chose)
+
+def getUserQuota(user):
+    proc = subprocess.Popen(['sudo', 'quota', user], stdout=subprocess.PIPE)
+    stdoutdata = proc.communicate()[0]
+    string_result = stdoutdata.split("\n")
+    quotas = []
+    for a_line in string_result[2:-1]:
+        usage, quota, limite, percentage, fs = a_line.split("\t")
+        if "mail" in fs:
+            label = u"Quota dans votre boite de réception"
+        elif fs == "/home-adh/%s" % (user[0],):
+            label = u"Quota dans votre home personnel"
+        else:
+            label = u"Quota dans %s" % (fs,)
+        line_dict = {
+            "label" : label,
+            "usage" : getFloat(usage),
+            "quota" : getFloat(quota),
+            "limite" : getFloat(limite),
+            "%" : getFloat(percentage),
+            "filesystem" : fs, # pourquoi pas ?
+        }
+        quotas.append(line_dict)
+    return quotas
+
+def fake_getUserQuota( userLogin ):
+    return [
+        {
+            '%': 33.9,
+            'quota': 390.62,
+            'label': u'Dossier personnel (fake)',
+            'limite': 585.94,
+            'filesystem': '/home',
+            'usage': 420.32
+        },
+        {
+            '%': 0.1,
+            'quota': 100.00,
+            'label': u'Boite de r\xe9ception (fake)',
+            'limite': 150.00,
+            'filesystem': '/var/mail',
+            'usage': 0.06
+        }
+    ]
+
diff --git a/utils/quota2.py b/utils/quota2.py
deleted file mode 100644
index 096bf49a..00000000
--- a/utils/quota2.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf8 -*-
-# Reloockage de quota.py, passage à l'intranet 2 
-# On retire le sudo par défaut, l'user execute lui meme quota
-# Ecrit il y a longtemps, dépoussiéré et enrichi par 
-# Gabriel Détraz detraz@crans.org
-
-import subprocess
-
-def getFloat( chose ):
-    chose = chose.replace(',', '.')
-    return float(chose)
-
-def getUserQuota(user):
-    proc = subprocess.Popen(['sudo','quota',user],stdout=subprocess.PIPE)
-    stdoutdata = proc.communicate()[0]
-    string_result = stdoutdata.split("\n")
-    quotas = []
-    for a_line in string_result[2:-1]:
-        usage, quota, limite, percentage, fs = a_line.split("\t")
-        if "mail" in fs:
-            label= u"Quota dans votre boite de réception"
-        elif fs=="/home-adh/"+user[0]:
-            label= u"Quota dans votre home personnel"
-        else:
-            label=u"Quota dans " + fs
-        line_dict = {
-           "label":label,
-           "usage":getFloat(usage),
-           "quota":getFloat(quota),
-           "limite":getFloat(limite),
-           "%":getFloat(percentage),
-           "filesystem":fs, # pourquoi pas ?
-        }
-        quotas.append(line_dict)
-    return quotas
-
-def fake_getUserQuota( userLogin ):
-    return [
-    {'%': 33.9,
-    'quota': 390.62,
-    'label': u'Dossier personnel (fake)',
-    'limite': 585.94,
-    'filesystem': '/home',
-    'usage': 420.32},
-    {'%': 0.1,
-    'quota': 100.00,
-    'label': u'Boite de r\xe9ception (fake)',
-    'limite': 150.00,
-    'filesystem': '/var/mail',
-    'usage': 0.06}
-    ]
-