do-nothing dispose() method in SingletonThreadPool

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 4452f6419fdb7f997451630fd6e226dc800dda11..ec6d249513bb5ce8df95990ee2f0b6ed3d4d4cb1 100644 (file)
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -179,6 +179,8 @@ class SingletonThreadPool(Pool):
         self._conns = {}
         self._creator = creator
 
+    def dispose(self):
+        pass
     def status(self):
         return "SingletonThreadPool id:%d thread:%d size: %d" % (id(self), thread.get_ident(), len(self._conns))
 

diff --git a/test/transaction.py b/test/transaction.py
index da2e94c05f3b4080f3b194b782185753b15d67dd..a009c447ca8e95d6ce5b74033183aeef4f9aef91 100644 (file)
--- a/test/transaction.py
+++ b/test/transaction.py
@@ -127,7 +127,7 @@ class TLTransactionTest(testbase.PersistTest):
 
     @testbase.unsupported('mysql', 'sqlite')
     def testnesting(self):
-        """test a basic rollback"""
+        """tests nesting of tranacstions"""
         external_connection = tlengine.connect()
         self.assert_(external_connection.connection is not tlengine.contextual_connect().connection)
         tlengine.begin()