diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-23 18:53:58 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-23 18:53:58 -0400 |
| commit | 101da94e1282a410557784272bda58222ac048b4 (patch) | |
| tree | ff28da0f37aa458a611cf0168327130d27ea3c86 /lib/sqlalchemy/orm/util.py | |
| parent | ee5dd855a72146327ee109f048a1ccba9cdc374a (diff) | |
| download | sqlalchemy-101da94e1282a410557784272bda58222ac048b4.tar.gz | |
the callcounts are greater here since object_mapper() has a little more overhead to it now
Diffstat (limited to 'lib/sqlalchemy/orm/util.py')
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index f4dfef3d5..3cbe3f84a 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -663,9 +663,7 @@ def object_state(instance): """ try: return attributes.instance_state(instance) - except exc.UnmappedClassError: - raise exc.UnmappedInstanceError(instance) - except exc.NO_STATE: + except (exc.UnmappedClassError, exc.NO_STATE): raise exc.UnmappedInstanceError(instance) |