X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2F__init__.py;h=fc9e0ff8c2bcdaf8026166c92c85713816d8ffb2;hp=c6f0974476129a1e1d910d536ddc446f0027ef62;hb=62de279ee18d0054b8eef779844365723250b96b;hpb=baba34a193fe7d304d86003b19f36ed638c7ec80

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index c6f0974..fc9e0ff 100644
--- 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):
-    value = str(value)
+    value = unicode(value)
     return value.replace('\\', '\\5c') \
                 .replace('*', '\\2a') \
                 .replace('(', '\\28') \
@@ -50,7 +50,8 @@ class DatabaseCursor(object):
         self.connection = ldap_connection
 
 class DatabaseFeatures(BaseDatabaseFeatures):
-    pass
+    def __init__(self, connection):
+        self.connection = connection
 
 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"
-        self.features = DatabaseFeatures()
+        self.features = DatabaseFeatures(self)
         self.ops = DatabaseOperations()
 
     def _cursor(self):