summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Jaury <pierre@jaury.eu>2016-10-16 16:45:54 +0200
committerPierre Jaury <pierre@jaury.eu>2016-10-16 16:45:54 +0200
commitd18221c542bf4d7381be2afdcd4c098698ff8eae (patch)
tree438b5f5e427cef7c9a74486adb5d6d0bcdce1136
parent055b207a9f80e1899a30cce8d11e79eb1136612a (diff)
downloadsqlalchemy-pr/315.tar.gz
Remove some legacy dead code from the declared_attr logicpr/315
The second 'if' condition was never called because the original condition always returns.
-rw-r--r--lib/sqlalchemy/ext/declarative/api.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py
index d02db7aa5..c3be636bb 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: