projects
/
matthijs
/
upstream
/
django-ldapdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
django 1.0 compatibility
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
query.py
diff --git
a/ldapdb/models/query.py
b/ldapdb/models/query.py
index 7346608505d888c759e0ace78beb0f8734cc612f..6eaecb117fcdb6232a0d7af33b1f796e2a310d48 100644
(file)
--- a/
ldapdb/models/query.py
+++ b/
ldapdb/models/query.py
@@
-25,7
+25,7
@@
import ldap
from django.db.models.query import QuerySet as BaseQuerySet
from django.db.models.query_utils import Q
from django.db.models.query import QuerySet as BaseQuerySet
from django.db.models.query_utils import Q
-from django.db.models.sql import BaseQuery
+from django.db.models.sql import
Query as
BaseQuery
from django.db.models.sql.where import WhereNode as BaseWhereNode, AND, OR
import ldapdb
from django.db.models.sql.where import WhereNode as BaseWhereNode, AND, OR
import ldapdb