Renommage de classes.

darcs-hash:20060323120058-68412-a54de9761bb2536361ce0c3422a4504dd2dcc7ef.gz

gestion/ldap_crans.py

@@ -2887,57 +2887,50 @@ class BorneWifi(Machine):
             return new
 
 
-class _fake_proprio(crans_ldap):
+class _FakeProprio(crans_ldap):
     """ Définitions de base d'un propriétaire virtuel """
     idn = ''
-    def __init__(s, conn=None):
-        s.conn = conn
-        if not s.conn:
-            s.connect()
-        s.dn = s.base_dn
-    def id(s):
+    def __init__(self, conn=None):
+        self.conn = conn
+        if not self.conn:
+            self.connect()
+        self.dn = self.base_dn
+    def id(self):
         return ''
-    def blacklist(s):
+    def blacklist(self):
         return []
-    def paiement(s):
+    def paiement(self):
         return [ ann_scol ]
-    def carteEtudiant(s):
+    def carteEtudiant(self):
         return [ ann_scol ]
-    def blacklist_actif(s):
+    def blacklist_actif(self):
         return []
     def mail(self, new=None):
         return 'roots@crans.org'
-    def machines(s):
-        res = s.conn.search_s(s.dn, 1, 'objectClass=machine')
+    def machines(self):
+        res = self.conn.search_s(self.dn, 1, Machine.filtre_idn)
         m = []
         for r in res:
-            if r[1].has_key('puissance'):
-                m.append(BorneWifi(r, '', s.conn))
-            else:
-                m.append(Machine(r, '', s.conn))
+            m.append(self.make(r))
         return m    
 
-class crans(_fake_proprio):
+class crans(_FakeProprio):
     """ Classe définissant l'assoce (pour affichage de ses machines) """
-    def __init__(s, conn=None):
-        s.conn = conn
-        if not s.conn:
-            s.connect()
-        s.dn = s.base_dn
-    def Nom(s):
+    def __init__(self, conn=None):
+        _FakeProprio.__init__(self, conn)
+    def Nom(self):
         return u"Crans"
-    def chbre(s):
+    def chbre(self):
         return u"CRA"
 
-class invite(_fake_proprio):
-    """ Propriétaire des machines invité """
-    def __init__(s, conn=None):
-        s.conn = conn
-        if not s.conn: s.connect()
-        s.dn = "ou=invites," + s.base_dn
-    def Nom(s):
+class invite(_FakeProprio):
+    """ Propriétaire des machines invitées """
+    def __init__(self, conn=None):
+        _FakeProprio.__init__(self, conn)
+        self.dn = "ou=invites," + self.base_dn
+    def Nom(self):
         return u"Invité"
-    def chbre(s):
+    def chbre(self):
         return u"N/A"
     
 if __name__ == '__main__':