X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=ldapdb%2Fmodels%2Fquery.py;h=d49b44a41d1977c8b37fdd6266b3df9fca662bfb;hb=676eb68eb45e24287c52381e8456d297acf55c51;hp=069c237916f515b8b51bd4c909b5a054bf8cf532;hpb=b1cc6993cafbf24e8a394d8b9bea1048efa8adc9;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 069c237..d49b44a 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -185,8 +185,10 @@ class Query(BaseQuery):
             for field in iter(self.model._meta.fields):
                 if field.attname == 'dn':
                     row.append(dn)
+                elif hasattr(field, 'from_ldap'):
+                    row.append(field.from_ldap(attrs.get(field.db_column, []), connection=ldapdb.connection))
                 else:
-                    row.append(attrs.get(field.db_column, None))
+                    row.append(None)
             yield row
 
 class QuerySet(BaseQuerySet):