From: Pierre Jaury <pierre@jaury.eu>
Date: Sun, 16 Oct 2016 14:45:54 +0000 (+0200)
Subject: Remove some legacy dead code from the declared_attr logic
X-Git-Tag: rel_1_0_16~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc74f434fdeb38df8f9897aa9e119fa840a86786;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Remove some legacy dead code from the declared_attr logic

The second 'if' condition was never called because the original
condition always returns.

(cherry picked from commit d18221c542bf4d7381be2afdcd4c098698ff8eae)
---

diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py
index 8068770c45..c65e3eab99 100644
--- a/lib/sqlalchemy/ext/declarative/api.py
+++ b/lib/sqlalchemy/ext/declarative/api.py
@@ -181,9 +181,6 @@ class declared_attr(interfaces._MappedAttribute, property):
                     "non-mapped class %s" %
                     (desc.fget.__name__, cls.__name__))
             return desc.fget(cls)
-
-        if reg is None:
-            return desc.fget(cls)
         elif desc in reg:
             return reg[desc]
         else: