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
convert get_db_prep_lookup() to new style (django 1.2+)
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
__init__.py
diff --git
a/ldapdb/__init__.py
b/ldapdb/__init__.py
index c6f0974476129a1e1d910d536ddc446f0027ef62..fc9e0ff8c2bcdaf8026166c92c85713816d8ffb2 100644
(file)
--- a/
ldapdb/__init__.py
+++ b/
ldapdb/__init__.py
@@
-38,7
+38,7
@@
from django.conf import settings
from django.db.backends import BaseDatabaseFeatures, BaseDatabaseOperations
def escape_ldap_filter(value):
from django.db.backends import BaseDatabaseFeatures, BaseDatabaseOperations
def escape_ldap_filter(value):
- value =
str
(value)
+ value =
unicode
(value)
return value.replace('\\', '\\5c') \
.replace('*', '\\2a') \
.replace('(', '\\28') \
return value.replace('\\', '\\5c') \
.replace('*', '\\2a') \
.replace('(', '\\28') \
@@
-50,7
+50,8
@@
class DatabaseCursor(object):
self.connection = ldap_connection
class DatabaseFeatures(BaseDatabaseFeatures):
self.connection = ldap_connection
class DatabaseFeatures(BaseDatabaseFeatures):
- pass
+ def __init__(self, connection):
+ self.connection = connection
class DatabaseOperations(BaseDatabaseOperations):
def quote_name(self, name):
class DatabaseOperations(BaseDatabaseOperations):
def quote_name(self, name):
@@
-60,7
+61,7
@@
class LdapConnection(object):
def __init__(self):
self.connection = None
self.charset = "utf-8"
def __init__(self):
self.connection = None
self.charset = "utf-8"
- self.features = DatabaseFeatures()
+ self.features = DatabaseFeatures(
self
)
self.ops = DatabaseOperations()
def _cursor(self):
self.ops = DatabaseOperations()
def _cursor(self):