diff options
| author | jvanasco <jonathan@2xlp.com> | 2014-10-17 19:37:47 -0400 |
|---|---|---|
| committer | jvanasco <jonathan@2xlp.com> | 2014-10-17 19:37:47 -0400 |
| commit | efca4af93603faa7abfeacbab264cad85ee4105c (patch) | |
| tree | c98b87e0a489c668acd119800c8a946dc7fdf9d4 /lib/sqlalchemy/ext | |
| parent | 4da020dae324cb871074e302f4840e8731988be0 (diff) | |
| parent | 61a4a89d993eda1d3168b501ba9ed8d94ea9b5f8 (diff) | |
| download | sqlalchemy-efca4af93603faa7abfeacbab264cad85ee4105c.tar.gz | |
Merged zzzeek/sqlalchemy into master
Diffstat (limited to 'lib/sqlalchemy/ext')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py index e84b21ad2..66fe05fd0 100644 --- a/lib/sqlalchemy/ext/declarative/api.py +++ b/lib/sqlalchemy/ext/declarative/api.py @@ -547,7 +547,7 @@ class AbstractConcreteBase(ConcreteBase): for scls in cls.__subclasses__(): sm = _mapper_or_none(scls) - if sm.concrete and cls in scls.__bases__: + if sm and sm.concrete and cls in scls.__bases__: sm._set_concrete_base(m) |