move field conversion

[matthijs/upstream/django-ldapdb.git] / ldapdb / models / query.py

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 069c237916f515b8b51bd4c909b5a054bf8cf532..d49b44a41d1977c8b37fdd6266b3df9fca662bfb 100644 (file)
--- 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):