X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2F__init__.py;h=60b6c865710b64130469fe4f51f4a8194b1ade6f;hp=2878d66e3fc48a5aaacb3c26b1d7eb9a7ac75598;hb=df8e8b0b5fb5d56de5b6138d2f21c70aab612730;hpb=4a68510605d2b23e2e46d0d3053cf3a0dbc789ff

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index 2878d66..60b6c86 100644
--- a/ldapdb/__init__.py
+++ b/ldapdb/__init__.py
@@ -32,42 +32,45 @@ def convert(field, value, func):
     else:
         return func(value)
         
-class LdapConnection():
+class LdapConnection(object):
     def __init__(self, server, bind_dn, bind_password):
         self.connection = ldap.initialize(server)
         self.connection.simple_bind_s(bind_dn, bind_password)
+        self.charset = "utf-8"
 
     def add_s(self, dn, modlist):
         mods = []
         for field, value in modlist:
-            converted = convert(field, value, lambda x: x.encode('utf-8'))
+            converted = convert(field, value, lambda x: x.encode(self.charset))
             if isinstance(converted, list):
                 mods.append((field, converted))
             else:
                 mods.append((field, [converted]))
-        return self.connection.add_s(dn, mods)
+        return self.connection.add_s(dn.encode(self.charset), mods)
 
     def delete_s(self, dn):
-        return self.connection.delete_s(dn)
+        return self.connection.delete_s(dn.encode(self.charset))
 
     def modify_s(self, dn, modlist):
         mods = []
         for op, field, value in modlist:
-            mods.append((op, field, convert(field, value, lambda x: x.encode('utf-8'))))
-        return self.connection.modify_s(dn, mods)
+            mods.append((op, field, convert(field, value, lambda x: x.encode(self.charset))))
+        return self.connection.modify_s(dn.encode(self.charset), mods)
 
     def rename_s(self, dn, newrdn):
-        return self.connection.rename_s(dn, newrdn)
+        return self.connection.rename_s(dn.encode(self.charset), newrdn.encode(self.charset))
 
     def search_s(self, base, scope, filterstr, attrlist):
-        results = self.connection.search_s(base, scope, filterstr, attrlist)
+        results = self.connection.search_s(base, scope, filterstr.encode(self.charset), attrlist)
+        output = []
         for dn, attrs in results:
             for field in attrs:
                 if field == "member" or field == "memberUid":
-                    attrs[field] = convert(field, attrs[field], lambda x: x.decode('utf-8'))
+                    attrs[field] = convert(field, attrs[field], lambda x: x.decode(self.charset))
                 else:
-                    attrs[field] = convert(field, attrs[field][0], lambda x: x.decode('utf-8'))
-        return results
+                    attrs[field] = convert(field, attrs[field][0], lambda x: x.decode(self.charset))
+            output.append((dn.decode(self.charset), attrs))
+        return output
 
 # FIXME: is this the right place to initialize the LDAP connection?
 connection = LdapConnection(settings.LDAPDB_SERVER_URI,