From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 24 Apr 2015 21:03:34 +0000 (-0400)
Subject: - add the "strict" version of this lookup for __abstract__ as well,
X-Git-Tag: rel_1_0_2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01700759346c82d6a39ee6a6c70581e8417b9c45;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- add the "strict" version of this lookup for __abstract__ as well,
fixes #3383
---

diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py
index d5fc76ed14..062936ea7f 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_)