From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 12 Mar 2015 17:34:43 +0000 (-0400)
Subject: - fix a get call here, we should figure this out since we dont want
X-Git-Tag: rel_1_0_0b1~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcbedfd61ae07315cd4b2d9cc76b5d2cb6d47926;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fix a get call here, we should figure this out since we dont want
to be using getattr
---

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 05349cf0bf..36180e8d5b 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3541,7 +3541,7 @@ class _ColumnEntity(_QueryEntity):
             attributes.QueryableAttribute,
             interfaces.PropComparator
         )):
-            _entity = column._parententity
+            _entity = getattr(column, '_parententity', None)
             if _entity is not None:
                 search_entities = False
             self._label_name = column.key