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
rename modules
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
base.py
diff --git
a/ldapdb/models/base.py
b/ldapdb/models/base.py
index 11b03d66710bfa62f2ae67cbd0c8ae81b43637b5..c64e59d9d2fbc52ae766b6ea2ed9651f0cd06f3e 100644
(file)
--- a/
ldapdb/models/base.py
+++ b/
ldapdb/models/base.py
@@
-25,8
+25,8
@@
import logging
import django.db.models
import django.db.models
-from granadilla.db import connection as ldap_connection
-from
granadilla.db
.query import QuerySet
+import ldapdb
+from
ldapdb.models
.query import QuerySet
class ModelBase(django.db.models.base.ModelBase):
"""
class ModelBase(django.db.models.base.ModelBase):
"""
@@
-77,7
+77,7
@@
class Model(django.db.models.base.Model):
Delete this entry.
"""
logging.debug("Deleting LDAP entry %s" % self.dn)
Delete this entry.
"""
logging.debug("Deleting LDAP entry %s" % self.dn)
- ldap
_
connection.delete_s(self.dn)
+ ldap
db.
connection.delete_s(self.dn)
def save(self):
# create a new entry
def save(self):
# create a new entry
@@
-93,7
+93,7
@@
class Model(django.db.models.base.Model):
entry.append((field.db_column, value))
logging.debug("Creating new LDAP entry %s" % new_dn)
entry.append((field.db_column, value))
logging.debug("Creating new LDAP entry %s" % new_dn)
- ldap
_
connection.add_s(new_dn, entry)
+ ldap
db.
connection.add_s(new_dn, entry)
# update object
self.dn = new_dn
# update object
self.dn = new_dn
@@
-115,7
+115,7
@@
class Model(django.db.models.base.Model):
if len(modlist):
logging.debug("Modifying existing LDAP entry %s" % self.dn)
if len(modlist):
logging.debug("Modifying existing LDAP entry %s" % self.dn)
- ldap
_
connection.modify_s(self.dn, modlist)
+ ldap
db.
connection.modify_s(self.dn, modlist)
else:
logging.debug("No changes to be saved to LDAP entry %s" % self.dn)
else:
logging.debug("No changes to be saved to LDAP entry %s" % self.dn)