X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=ldapdb%2Fmodels%2Fbase.py;h=9ba331edfd45f43d75a859e7d5f0c6659405b89a;hb=c1265f3b8c5d88ac3fa0de1a4b1756c6cdc9d7a2;hp=11b03d66710bfa62f2ae67cbd0c8ae81b43637b5;hpb=fe6e3af37054aa100679acf8236e17cc45c883a1;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/models/base.py b/ldapdb/models/base.py
index 11b03d6..9ba331e 100644
--- a/ldapdb/models/base.py
+++ b/ldapdb/models/base.py
@@ -25,18 +25,15 @@ import logging
 
 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):
     """
     Metaclass for all LDAP models.
     """
     def __new__(cls, name, bases, attrs):
-        attr_meta = attrs.get('Meta', None)
-        if attr_meta:
-            dn = attr_meta._dn
-            object_classes = attr_meta._object_classes
+        attr_meta = attrs.pop('Ldap', None)
 
         super_new = super(ModelBase, cls).__new__
         new_class = super_new(cls, name, bases, attrs)
@@ -48,8 +45,8 @@ class ModelBase(django.db.models.base.ModelBase):
         new_class._default_manager.get_query_set = get_query_set
 
         if attr_meta:
-            new_class._meta.dn = dn
-            new_class._meta.object_classes = attr_meta._object_classes
+            new_class._meta.dn = attr_meta.dn
+            new_class._meta.object_classes = attr_meta.object_classes
 
         return new_class
 
@@ -77,7 +74,7 @@ class Model(django.db.models.base.Model):
         Delete this entry.
         """
         logging.debug("Deleting LDAP entry %s" % self.dn)
-        ldap_connection.delete_s(self.dn)
+        ldapdb.connection.delete_s(self.dn)
         
     def save(self):
         # create a new entry
@@ -93,7 +90,7 @@ class Model(django.db.models.base.Model):
                     entry.append((field.db_column, value))
 
             logging.debug("Creating new LDAP entry %s" % new_dn)
-            ldap_connection.add_s(new_dn, entry)
+            ldapdb.connection.add_s(new_dn, entry)
             
             # update object
             self.dn = new_dn
@@ -115,7 +112,7 @@ class Model(django.db.models.base.Model):
 
         if len(modlist):
             logging.debug("Modifying existing LDAP entry %s" % self.dn)
-            ldap_connection.modify_s(self.dn, modlist)
+            ldapdb.connection.modify_s(self.dn, modlist)
         else:
             logging.debug("No changes to be saved to LDAP entry %s" % self.dn)