Remove some legacy dead code from the declared_attr logic

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

diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py
index d02db7aa539d3c6fa887696c51a01231eabd9c80..c3be636bb011b1ddeb2a5d126896a7901c6ca087 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: