X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2F__init__.py;h=44d4974e9148d9c5ba9738be42531ef361c854ad;hp=521188cea9a0abe183e1b4bb7e547985c86ea701;hb=3e119b381a67261e2b70646117f29bd799c776c1;hpb=64e97c911098ea9471c23d41d78f789f3abf07bf

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index 521188c..44d4974 100644
--- a/ldapdb/__init__.py
+++ b/ldapdb/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # 
 # django-ldapdb
-# Copyright (c) 2009-2010, Bolloré telecom
+# Copyright (c) 2009-2011, Bolloré telecom
 # All rights reserved.
 # 
 # See AUTHORS file for a full list of contributors.
@@ -32,11 +32,8 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-from django import db
 from django.conf import settings
 
-from ldapdb.router import Router
-
 def escape_ldap_filter(value):
     value = unicode(value)
     return value.replace('\\', '\\5c') \
@@ -45,14 +42,17 @@ def escape_ldap_filter(value):
                 .replace(')', '\\29') \
                 .replace('\0', '\\00')
 
-# Add the LDAP backend
-settings.DATABASES['ldap'] = {
-    'ENGINE': 'ldapdb.backends.ldap',
-    'NAME': settings.LDAPDB_SERVER_URI,
-    'USER': settings.LDAPDB_BIND_DN,
-    'PASSWORD': settings.LDAPDB_BIND_PASSWORD,
-    'SUPPORTS_TRANSACTIONS': False}
-connection = db.connections['ldap']
+# Legacy single database support
+if hasattr(settings, 'LDAPDB_SERVER_URI'):
+    from django import db
+    from ldapdb.router import Router
+
+    # Add the LDAP backend
+    settings.DATABASES['ldap'] = {
+        'ENGINE': 'ldapdb.backends.ldap',
+        'NAME': settings.LDAPDB_SERVER_URI,
+        'USER': settings.LDAPDB_BIND_DN,
+        'PASSWORD': settings.LDAPDB_BIND_PASSWORD}
 
-# Add the LDAP router
-db.router.routers.append(Router())
+    # Add the LDAP router
+    db.router.routers.append(Router())