X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Fmodels%2Fbase.py;h=a0ade49ea87d631cac2eb089685b48d65ca9b6c9;hb=bb0d161101fe9f6fde920db23482b1e1b8e7b904;hp=cdc44e21fc4e32869dc0c49043951a88f130f102;hpb=81037a75f672596982475a7081946bfd9b4fd286;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/models/base.py b/ldapdb/models/base.py
index cdc44e2..a0ade49 100644
--- a/ldapdb/models/base.py
+++ b/ldapdb/models/base.py
@@ -40,10 +40,11 @@ class ModelBase(django.db.models.base.ModelBase):
         new_class = super_new(cls, name, bases, attrs)
 
         # patch manager to use our own QuerySet class
-        def get_query_set():
-            return QuerySet(new_class)
-        new_class.objects.get_query_set = get_query_set
-        new_class._default_manager.get_query_set = get_query_set
+        if not new_class._meta.abstract:
+            def get_query_set():
+                return QuerySet(new_class)
+            new_class.objects.get_query_set = get_query_set
+            new_class._default_manager.get_query_set = get_query_set
 
         if attr_meta:
             new_class._meta.dn = attr_meta.dn
@@ -154,7 +155,8 @@ class Model(django.db.models.base.Model):
         """
         import new
         import re
-        name = "%s_%s" % (base_class.__name__, re.sub('[=,]', '_', base_dn))
+        suffix = re.sub('[=,]', '_', base_dn)
+        name = "%s_%s" % (base_class.__name__, str(suffix))
         new_class = new.classobj(name, (base_class,), {'base_dn': base_dn, '__module__': base_class.__module__})
         return new_class