Changeset 2221

Timestamp:

04/28/05 23:36:22 (19 years ago)

Author:

jerome

Message:

Add a workaround for users with an old version of python-ldap.

Files:

• pykota/trunk/pykota/storages/ldapstorage.py (modified) (5 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -29 +29 @@
 #
 
+import sys
 import os
 import types
@@ -40 +41 @@
     import ldap
     import ldap.modlist
-    import ldap.cidict
 except ImportError :    
-    import sys
     raise PyKotaStorageError, "This python version (%s) doesn't seem to have the python-ldap module installed correctly." % sys.version.split()[0]
+else :    
+    try :
+        from ldap.cidict import cidict
+    except ImportError :    
+        import UserDict
+        sys.stderr.write("ERROR: PyKota requires a newer version of python-ldap. Workaround activated. Please upgrade python-ldap !\n")
+        class cidict(UserDict.UserDict) :
+            pass # Fake it all, and don't care for case insensitivity : users who need it will have to upgrade.
     
 class Storage(BaseStorage) :
@@ -159 +166 @@
             else :     
                 self.tool.logdebug("QUERY : Result : %s" % result)
-                result = [ (dn, ldap.cidict.cidict(attrs)) for (dn, attrs) in result ]
+                result = [ (dn, cidict(attrs)) for (dn, attrs) in result ]
                 if self.useldapcache :
                     for (dn, attributes) in result :
@@ -169 +176 @@
     def doAdd(self, dn, fields) :
         """Adds an entry in the LDAP directory."""
-        fields = self.normalizeFields(ldap.cidict.cidict(fields))
+        fields = self.normalizeFields(cidict(fields))
         message = ""
         for tryit in range(3) :
@@ -215 +222 @@
     def doModify(self, dn, fields, ignoreold=1, flushcache=0) :
         """Modifies an entry in the LDAP directory."""
-        fields = ldap.cidict.cidict(fields)
+        fields = cidict(fields)
         for tryit in range(3) :
             try :