diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-08 15:52:50 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-08 15:52:50 -0400 |
| commit | 56e628ea203219a7492c17e60eb58cd55c7d5caf (patch) | |
| tree | 4b775d48f16c2be50c608b996f098f26850d0db7 /lib/sqlalchemy/orm/util.py | |
| parent | 9aa5d574fe743bae63d300953752c395a8dfe1b5 (diff) | |
| parent | bb3be98d3bee4b2bcef791be022ddb2510b9cf9c (diff) | |
| download | sqlalchemy-56e628ea203219a7492c17e60eb58cd55c7d5caf.tar.gz | |
- merge tip
- fixes
Diffstat (limited to 'lib/sqlalchemy/orm/util.py')
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index 49f572572..be2b024a2 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -546,7 +546,7 @@ def _entity_descriptor(entity, key): """ if not isinstance(entity, (AliasedClass, type)): entity = entity.class_ - + try: return getattr(entity, key) except AttributeError: |