X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2F__init__.py;h=1aa900725a59d96dd9ae987f23b060aee1bab0f9;hb=9e27d57f8a65302eff3a71564b454b1dc8efce80;hp=4d6f8cf8a8a98eb20d4ab3e9cb910b13e68e54ff;hpb=82a5a4df7e7899646501206fb99925c79394d1c6;p=matthijs%2Fupstream%2Fdjango-ldapdb.git diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py index 4d6f8cf..1aa9007 100644 --- a/ldapdb/__init__.py +++ b/ldapdb/__init__.py @@ -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') \ @@ -47,14 +44,15 @@ def escape_ldap_filter(value): # 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, - 'SUPPORTS_TRANSACTIONS': False} - connection = db.connections['ldap'] + 'PASSWORD': settings.LDAPDB_BIND_PASSWORD} # Add the LDAP router db.router.routers.append(Router())