diff options
| author | Jason Kirtland <jek@discorporate.us> | 2008-08-21 14:24:45 +0000 |
|---|---|---|
| committer | Jason Kirtland <jek@discorporate.us> | 2008-08-21 14:24:45 +0000 |
| commit | d08821ee5ec566132cb813d2e65e20052c1f712a (patch) | |
| tree | 3d3fe4cf0427986f9dcaf53fbe241eb40814ce4b /lib | |
| parent | 90ba350099e10c2ac46174f301e66212b42d3386 (diff) | |
| download | sqlalchemy-d08821ee5ec566132cb813d2e65e20052c1f712a.tar.gz | |
- Another old-style mixin fix and an explicit mapper() test for it.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index d8f32d625..ff6c7b02c 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -1044,6 +1044,8 @@ class ClassManager(dict): self.local_attrs = {} self.originals = {} for base in class_.__mro__[-2:0:-1]: # reverse, skipping 1st and last + if not isinstance(base, type): + continue cls_state = manager_of_class(base) if cls_state: self.update(cls_state) |