Don't assume that exception block leaks the caught error (will break in Python 3).

Author: Cito

DBUtils/SteadyDB.py

@@ -595,6 +595,7 @@ def tough_method(*args, **kwargs):
                             con._store(con2)
                             self._cursor = cursor2
                             raise error # raise the original error again
+                        error2 = None
                         try: # try one more time to execute
                             if execute:
                                 self._setsizes(cursor2)
@@ -604,19 +605,20 @@ def tough_method(*args, **kwargs):
                                 self._clearsizes()
                         except error.__class__: # same execution error
                             use2 = False
+                            error2 = error
                         except Exception, error: # other execution errors
                             use2 = True
+                            error2 = error
                         else:
                             use2 = True
-                            error = None
                         if use2:
                             self.close()
                             con._close()
                             con._store(con2)
                             self._cursor = cursor2
                             con._usage += 1
-                            if error:
-                                raise error # raise the other error
+                            if error2:
+                                raise error2 # raise the other error
                             return result
                         try:
                             cursor2.close()

DBUtils/Tests/TestPooledDB.py

@@ -22,7 +22,8 @@
 sys.path.insert(1, '../..')
 # The TestSteadyDB module serves as a mock object for the DB-API 2 module:
 from DBUtils.Tests import TestSteadyDB as dbapi
-from DBUtils.PooledDB import PooledDB, TooManyConnections, SharedDBConnection
+from DBUtils.PooledDB import (PooledDB, SharedDBConnection,
+    InvalidConnection, TooManyConnections)
 
 
 class TestPooledDB(unittest.TestCase):
@@ -208,7 +209,7 @@ def test04_CloseConnection(self):
             if shareable:
                 self.assertEqual(db._shared_con, None)
                 self.assertEqual(shared_con.shared, 0)
-            self.assert_(not hasattr(db, '_usage'))
+            self.assertRaises(InvalidConnection, getattr, db, '_usage')
             self.assert_(not hasattr(db_con, '_num_queries'))
             self.assertEqual(len(pool._idle_cache), 1)
             self.assertEqual(pool._idle_cache[0]._con, db_con)

DBUtils/Tests/TestPooledPg.py

@@ -22,7 +22,7 @@
 sys.path.insert(1, '../..')
 # The TestSteadyPg module serves as a mock object for the pg API module:
 from DBUtils.Tests import TestSteadyPg
-from DBUtils.PooledPg import PooledPg
+from DBUtils.PooledPg import PooledPg, InvalidConnection
 
 
 class TestPooledPg(unittest.TestCase):
@@ -95,7 +95,7 @@ def test2_CloseConnection(self):
         db.query('select test')
         self.assertEqual(db.num_queries, 1)
         db.close()
-        self.assert_(not hasattr(db, 'num_queries'))
+        self.assertRaises(InvalidConnection, getattr, db, 'num_queries')
         db = pool.connection()
         self.assert_(hasattr(db, 'dbname'))
         self.assertEqual(db.dbname, 'PooledPgTestDB')