Mike Bayer avatar Mike Bayer committed 5977ecc

py3k fixes

Comments (0)

Files changed (2)

lib/sqlalchemy/orm/util.py

     """
     try:
         return attributes.instance_state(instance)
-    except (exc.UnmappedClassError, exc.NO_STATE):
+        # TODO: whats the py-2/3 syntax to catch two
+        # different kinds of exceptions at once ?
+    except exc.UnmappedClassError:
+        raise exc.UnmappedInstanceError(instance)
+    except exc.NO_STATE:
         raise exc.UnmappedInstanceError(instance)
 
 

test/aaa_profiling/test_orm.py

         # bigger operation so using a small variance
 
         @profiling.function_call_count(variance=0.05,
-                versions={'2.7':85, '2.6':85, '2.5':94, '3': 83})
+                versions={'2.7':85, '2.6':85, '2.5':94, '3': 95})
         def go():
             return sess2.merge(p1, load=False)
         p2 = go()
         # third call, merge object already present. almost no calls.
 
         @profiling.function_call_count(variance=0.05,
-                versions={'2.7':14, '2.6':14, '2.5':15, '3': 12})
+                versions={'2.7':14, '2.6':14, '2.5':15, '3': 15})
         def go():
             return sess2.merge(p2, load=False)
         p3 = go()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.