fixed some imports, transaction hanging open

diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index ac6b37e3360afb596e5764b666c0f49e4ba81849..ab1d23f9c9d13cee45f6ac581451915e3d9b8e69 100644 (file)
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -6,7 +6,7 @@
 
 """sqlalchemy.orm.interfaces.LoaderStrategy implementations, and related MapperOptions."""
 
-from sqlalchemy import sql, schema, util, attributes, exceptions, sql_util, logging
+from sqlalchemy import sql, schema, util, exceptions, sql_util, logging
 import mapper, query
 from interfaces import *
 import session as sessionlib

diff --git a/test/base/dependency.py b/test/base/dependency.py
index d2b5bd698e50066d363fa7d40e671af8e5ffd446..88aacfe216515d33c493ec347d3a528265f698d0 100644 (file)
--- a/test/base/dependency.py
+++ b/test/base/dependency.py
@@ -1,5 +1,5 @@
 from testbase import PersistTest
-import sqlalchemy.orm.topological as topological
+import sqlalchemy.topological as topological
 import unittest, sys, os
 
 

diff --git a/test/orm/inheritance.py b/test/orm/inheritance.py
index 392e54407f5ecc98ea509d765d25f368afe4fdf0..d01fc5c4f1878738c8d564528b440fe0cb5eeb73 100644 (file)
--- a/test/orm/inheritance.py
+++ b/test/orm/inheritance.py
@@ -1,7 +1,6 @@
 import testbase
 from sqlalchemy import *
 import string
-import sqlalchemy.attributes as attr
 import sys
 
 class Principal( object ):

diff --git a/test/orm/manytomany.py b/test/orm/manytomany.py
index 1768ecf6c2561604405530e1054159bdca5a6cf4..443e93ab24378645c9984744aad2894f8ee5868b 100644 (file)
--- a/test/orm/manytomany.py
+++ b/test/orm/manytomany.py
@@ -1,7 +1,6 @@
 import testbase
 from sqlalchemy import *
 import string
-import sqlalchemy.attributes as attr
 
 class Place(object):
     '''represents a place'''

diff --git a/test/orm/session.py b/test/orm/session.py
index 420dba4f48cebffd62f2b673b028f2f6773aec94..0fbf5818b370c6bf8a4033ca050c3d49be1bb8e6 100644 (file)
--- a/test/orm/session.py
+++ b/test/orm/session.py
@@ -41,24 +41,27 @@ class SessionTest(AssertMixin):
 
     def test_close_two(self):
         c = testbase.db.connect()
-        class User(object):pass
-        mapper(User, users)
-        s = create_session(bind_to=c)
-        tran = s.create_transaction()
-        s.save(User())
-        s.flush()
-        c.execute("select * from users")
-        u = User()
-        s.save(u)
-        s.user_name = 'some user'
-        s.flush()
-        u = User()
-        s.save(u)
-        s.user_name = 'some other user'
-        s.flush()
-        assert s.transaction is tran
-        tran.close()
-
+        try:
+            class User(object):pass
+            mapper(User, users)
+            s = create_session(bind_to=c)
+            tran = s.create_transaction()
+            s.save(User())
+            s.flush()
+            c.execute("select * from users")
+            u = User()
+            s.save(u)
+            s.user_name = 'some user'
+            s.flush()
+            u = User()
+            s.save(u)
+            s.user_name = 'some other user'
+            s.flush()
+            assert s.transaction is tran
+            tran.close()
+        finally:
+            c.close()
+        
 class OrphanDeletionTest(AssertMixin):
 
     def setUpAll(self):