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
fix
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
base.py
diff --git
a/ldapdb/models/base.py
b/ldapdb/models/base.py
index 44d495b22716cd4266e3e7f3e18d415fca0e6652..363ae92fcfb912cbb2b623c876ee328a9e139680 100644
(file)
--- a/
ldapdb/models/base.py
+++ b/
ldapdb/models/base.py
@@
-18,8
+18,6
@@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-# -*- coding: utf-8 -*-
-
import ldap
import logging
import ldap
import logging
@@
-34,8
+32,6
@@
class ModelBase(django.db.models.base.ModelBase):
Metaclass for all LDAP models.
"""
def __new__(cls, name, bases, attrs):
Metaclass for all LDAP models.
"""
def __new__(cls, name, bases, attrs):
- attr_meta = attrs.pop('Ldap', None)
-
super_new = super(ModelBase, cls).__new__
new_class = super_new(cls, name, bases, attrs)
super_new = super(ModelBase, cls).__new__
new_class = super_new(cls, name, bases, attrs)
@@
-46,10
+42,6
@@
class ModelBase(django.db.models.base.ModelBase):
new_class.objects.get_query_set = get_query_set
new_class._default_manager.get_query_set = get_query_set
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
- new_class._meta.object_classes = attr_meta.object_classes
-
return new_class
class Model(django.db.models.base.Model):
return new_class
class Model(django.db.models.base.Model):
@@
-155,7
+147,8
@@
class Model(django.db.models.base.Model):
"""
import new
import re
"""
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
new_class = new.classobj(name, (base_class,), {'base_dn': base_dn, '__module__': base_class.__module__})
return new_class