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 8068770c452f077445d2e38ffb630f484f2f3de9..c65e3eab99b89bd9ccc3f0accb65f9bff012cb1e 100644 (file)
--- 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: