From fe058da9105ff388635b2c877819cb2fd2f9e3fc Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <Nicolas.Dandrimont@crans.org>
Date: Sat, 16 Oct 2010 15:18:50 +0200
Subject: [PATCH 1/4] [lc_ldap] Nettoyage de la fonction de blacklist

---
 lc_ldap.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lc_ldap.py b/lc_ldap.py
index a21f020..18e1caa 100644
--- a/lc_ldap.py
+++ b/lc_ldap.py
@@ -43,15 +43,16 @@ base_dn = 'ou=data,dc=crans,dc=org'
 
 def is_actif(sanction):
     """Retourne True ou False suivant si la sanction fournie (chaîne
-    venant de blacklist) est active ou non
+    venant de blacklist) est active ou non.
+    La blacklist est de la forme "debut$fin$..."
     """
-    bl = sanction.split('$')
+    bl_debut, bl_fin, _ = sanction.split('$', 3)
     now = time.time()
-    debut = int(bl[0])
-    if bl[1] == '-':
+    debut = int(bl_debut)
+    if bl_fin == '-':
         fin = now + 1
     else:
-        fin = int(bl[1])
+        fin = int(bl_fin)
     return debut < now and fin > now
 
 def uldif_to_ldif(uldif):

From f30f9284c8c6e6b2c55312519e305b9faca80fc9 Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <Nicolas.Dandrimont@crans.org>
Date: Sat, 16 Oct 2010 15:19:16 +0200
Subject: [PATCH 2/4] [lc_ldap] Documentation du binding ldap de test

---
 lc_ldap.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lc_ldap.py b/lc_ldap.py
index 18e1caa..8c290e7 100644
--- a/lc_ldap.py
+++ b/lc_ldap.py
@@ -72,6 +72,7 @@ def ldif_to_uldif(ldif):
     return uldif
 
 def lc_ldap_test():
+    """Binding LDAP à la base de tests"""
     return lc_ldap(dn='cn=admin,dc=crans,dc=org', cred='75bdb64f32')
 
 class lc_ldap(ldap.ldapobject.LDAPObject):

From b67c19f36fd7bc08570e4af7fd701599f7556861 Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <Nicolas.Dandrimont@crans.org>
Date: Sat, 16 Oct 2010 15:19:44 +0200
Subject: [PATCH 3/4] =?UTF-8?q?[lc=5Fldap]=20H=C3=A9rite=20de=20object=20p?=
 =?UTF-8?q?our=20les=20classes=20en=20Python.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lc_ldap.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lc_ldap.py b/lc_ldap.py
index 8c290e7..6446900 100644
--- a/lc_ldap.py
+++ b/lc_ldap.py
@@ -215,7 +215,7 @@ class lc_ldap(ldap.ldapobject.LDAPObject):
 
 
 
-class CransLdapObject:
+class CransLdapObject(object):
     mode = 'ro'
 
     attrs = None   # Contient un dico uldif qui doit représenter ce qui

From 321015d01ae194d2f698afb93b3255732c72eb7d Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <Nicolas.Dandrimont@crans.org>
Date: Sat, 16 Oct 2010 15:20:07 +0200
Subject: [PATCH 4/4] [lc_ldap] Pylint

---
 lc_ldap.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lc_ldap.py b/lc_ldap.py
index 6446900..c8484e1 100644
--- a/lc_ldap.py
+++ b/lc_ldap.py
@@ -477,7 +477,8 @@ class CransLdapObject(object):
 class proprio(CransLdapObject):
     ufields = [ 'nom', 'chbre' ]
     mfields = [ 'paiement', 'info', 'blacklist', 'controle']
-    ofields = []; xfields = []
+    ofields = []
+    xfields = []
     _machines = None
     def machines(self):
         if self._machines == None: