From: jlaine <jlaine@e071eeec-0327-468d-9b6a-08194a12b294>
Date: Tue, 1 Jun 2010 13:02:55 +0000 (+0000)
Subject: use self.query in compiler
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=commitdiff_plain;h=63acf2102a20f6dacb548676a7099edc25b2cc71

use self.query in compiler


git-svn-id: https://svn.bolloretelecom.eu/opensource/django-ldapdb/trunk@917 e071eeec-0327-468d-9b6a-08194a12b294
---

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index e55c161..07a6312 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -70,7 +70,6 @@ class Compiler(object):
         self.using = using
 
     def results_iter(self):
-        query = self.query
         if self.query.select_fields:
             fields = self.query.select_fields
         else:
@@ -80,22 +79,21 @@ class Compiler(object):
 
         try:
             vals = self.connection.search_s(
-                query.model.base_dn,
+                self.query.model.base_dn,
                 ldap.SCOPE_SUBTREE,
-                filterstr=query._ldap_filter(),
+                filterstr=self.query._ldap_filter(),
                 attrlist=attrlist,
             )
         except ldap.NO_SUCH_OBJECT:
             return
-            raise query.model.DoesNotExist
 
         # perform sorting
-        if query.extra_order_by:
-            ordering = query.extra_order_by
-        elif not query.default_ordering:
-            ordering = query.order_by
+        if self.query.extra_order_by:
+            ordering = self.query.extra_order_by
+        elif not self.query.default_ordering:
+            ordering = self.query.order_by
         else:
-            ordering = query.order_by or query.model._meta.ordering
+            ordering = self.query.order_by or self.query.model._meta.ordering
         def cmpvals(x, y):
             for fieldname in ordering:
                 if fieldname.startswith('-'):
@@ -103,7 +101,7 @@ class Compiler(object):
                     negate = True
                 else:
                     negate = False
-                field = query.model._meta.get_field(fieldname)
+                field = self.query.model._meta.get_field(fieldname)
                 attr_x = field.from_ldap(x[1].get(field.db_column, []), connection=self.connection)
                 attr_y = field.from_ldap(y[1].get(field.db_column, []), connection=self.connection)
                 # perform case insensitive comparison