From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 22 Oct 2006 19:10:44 +0000 (+0000)
Subject: fixed some imports, transaction hanging open
X-Git-Tag: rel_0_3_0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0be0131a448f43aa4969792aa0158551163ce499;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fixed some imports, transaction hanging open
---

diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index ac6b37e336..ab1d23f9c9 100644
--- 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 d2b5bd698e..88aacfe216 100644
--- 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 392e54407f..d01fc5c4f1 100644
--- 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 1768ecf6c2..443e93ab24 100644
--- 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 420dba4f48..0fbf5818b3 100644
--- 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):