X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2F__init__.py;h=d1dcc47d05012a4260431dcabc6b2b3ffe306068;hb=de6f78f7a31674ccb7e7f223f3272e4970cdb757;hp=4b0a6d54379abaf9dbb55d1037426fe0a2148d32;hpb=b1cc6993cafbf24e8a394d8b9bea1048efa8adc9;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index 4b0a6d5..d1dcc47 100644
--- a/ldapdb/__init__.py
+++ b/ldapdb/__init__.py
@@ -24,6 +24,7 @@ from django.conf import settings
 from django.db.backends import BaseDatabaseFeatures, BaseDatabaseOperations
 
 def convert(field, value, func):
+    # FIXME : we should not reference the attribute name!
     if not value or field == 'jpegPhoto':
         return value
     elif isinstance(value, int):
@@ -99,10 +100,7 @@ class LdapConnection(object):
         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(self.charset))
-                else:
-                    attrs[field] = convert(field, attrs[field][0], lambda x: x.decode(self.charset))
+                attrs[field] = convert(field, attrs[field], lambda x: x.decode(self.charset))
             output.append((dn.decode(self.charset), attrs))
         return output