]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- add the "strict" version of this lookup for __abstract__ as well,
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 24 Apr 2015 21:03:34 +0000 (17:03 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 24 Apr 2015 21:03:34 +0000 (17:03 -0400)
fixes #3383

lib/sqlalchemy/ext/declarative/base.py

index d5fc76ed14ab54e7299816f8cbfafb78172842bf..062936ea7fe3445fcce56b741b74d12db92b1ca8 100644 (file)
@@ -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_)