summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-04-24 17:03:34 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-04-24 17:03:34 -0400
commit01700759346c82d6a39ee6a6c70581e8417b9c45 (patch)
tree3057eacf61a48d2230b6578a20e3d0dfa7c35dca
parentf7e89f887fa411d00f4df84315170369bc752885 (diff)
downloadsqlalchemy-01700759346c82d6a39ee6a6c70581e8417b9c45.tar.gz
- add the "strict" version of this lookup for __abstract__ as well,
fixes #3383
-rw-r--r--lib/sqlalchemy/ext/declarative/base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py
index d5fc76ed1..062936ea7 100644
--- a/lib/sqlalchemy/ext/declarative/base.py
+++ b/lib/sqlalchemy/ext/declarative/base.py
@@ -39,7 +39,7 @@ def _resolve_for_abstract(cls):
if cls is object:
return None
- if _get_immediate_cls_attr(cls, '__abstract__'):
+ if _get_immediate_cls_attr(cls, '__abstract__', strict=True):
for sup in cls.__bases__:
sup = _resolve_for_abstract(sup)
if sup is not None:
@@ -82,7 +82,7 @@ def _as_declarative(cls, classname, dict_):
from .api import declared_attr
declarative_props = (declared_attr, util.classproperty)
- if _get_immediate_cls_attr(cls, '__abstract__'):
+ if _get_immediate_cls_attr(cls, '__abstract__', strict=True):
return
_MapperConfig.setup_mapping(cls, classname, dict_)