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
start splitting code to an actual backend
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
__init__.py
diff --git
a/ldapdb/__init__.py
b/ldapdb/__init__.py
index fc9e0ff8c2bcdaf8026166c92c85713816d8ffb2..7fec75dc41c733a6cebdddff51656ce4563c2700 100644
(file)
--- a/
ldapdb/__init__.py
+++ b/
ldapdb/__init__.py
@@
-57,19
+57,23
@@
class DatabaseOperations(BaseDatabaseOperations):
def quote_name(self, name):
return name
def quote_name(self, name):
return name
-class LdapConnection(object):
- def __init__(self):
+class DatabaseWrapper(object):
+ def __init__(self, settings_dict={}, alias='ldap'):
+ self.settings_dict = settings_dict
self.connection = None
self.charset = "utf-8"
self.features = DatabaseFeatures(self)
self.ops = DatabaseOperations()
self.connection = None
self.charset = "utf-8"
self.features = DatabaseFeatures(self)
self.ops = DatabaseOperations()
+ def close(self):
+ pass
+
def _cursor(self):
if self.connection is None:
def _cursor(self):
if self.connection is None:
- self.connection = ldap.initialize(se
ttings.LDAPDB_SERVER_URI
)
+ self.connection = ldap.initialize(se
lf.settings_dict['NAME']
)
self.connection.simple_bind_s(
self.connection.simple_bind_s(
- se
ttings.LDAPDB_BIND_DN
,
- se
ttings.LDAPDB_BIND_PASSWORD
)
+ se
lf.settings_dict['USER']
,
+ se
lf.settings_dict['PASSWORD']
)
return DatabaseCursor(self.connection)
def add_s(self, dn, modlist):
return DatabaseCursor(self.connection)
def add_s(self, dn, modlist):
@@
-97,5
+101,8
@@
class LdapConnection(object):
return output
# FIXME: is this the right place to initialize the LDAP connection?
return output
# FIXME: is this the right place to initialize the LDAP connection?
-connection = LdapConnection()
+connection = DatabaseWrapper({
+ 'NAME': settings.LDAPDB_SERVER_URI,
+ 'USER': settings.LDAPDB_BIND_DN,
+ 'PASSWORD': settings.LDAPDB_BIND_PASSWORD})