the callcounts are greater here since object_mapper() has a little more overhead...

diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index f4dfef3d5e0878ab8f84d7066ce5f03a12dced03..3cbe3f84afc320056e0566a159b0c08576bcef0b 100644 (file)
--- 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)
 
 

diff --git a/test/aaa_profiling/test_orm.py b/test/aaa_profiling/test_orm.py
index e5e04eea8e2d4a79864f2647fbadc2211f3cd02e..8d2c3741079803a7beb5fb8d1a6c1ae9a5ab7ccd 100644 (file)
--- a/test/aaa_profiling/test_orm.py
+++ b/test/aaa_profiling/test_orm.py
@@ -70,7 +70,7 @@ class MergeTest(fixtures.MappedTest):
         # third call, merge object already present. almost no calls.
 
         @profiling.function_call_count(variance=0.05,
-                versions={'2.7':11, '2.6':11, '2.5':15, '3': 12})
+                versions={'2.7':14, '2.6':14, '2.5':15, '3': 12})
         def go():
             return sess2.merge(p2, load=False)
         p3 = go()