From 4b614b9b35cd2baddb7ca67c04bee5d70ec6a172 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 27 Apr 2013 19:53:57 -0400
Subject: - the raw 2to3 run - went through examples/ and cleaned out excess
 list() calls

---
 lib/sqlalchemy/pool.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/sqlalchemy/pool.py')

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 501b6d2a0..562a76163 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -57,7 +57,7 @@ def clear_managers():
     All pools and connections are disposed.
     """
 
-    for manager in proxies.itervalues():
+    for manager in proxies.values():
         manager.close()
     proxies.clear()
 
@@ -368,7 +368,7 @@ class _ConnectionRecord(object):
             connection = self.__pool._creator()
             self.__pool.logger.debug("Created new connection %r", connection)
             return connection
-        except Exception, e:
+        except Exception as e:
             self.__pool.logger.debug("Error on connect(): %s", e)
             raise
 
@@ -391,7 +391,7 @@ def _finalize_fairy(connection, connection_record, pool, ref, echo):
             # Immediately close detached instances
             if connection_record is None:
                 pool._close_connection(connection)
-        except Exception, e:
+        except Exception as e:
             if connection_record is not None:
                 connection_record.invalidate(e=e)
             if isinstance(e, (SystemExit, KeyboardInterrupt)):
@@ -499,7 +499,7 @@ class _ConnectionFairy(object):
                                             self._connection_record,
                                             self)
                 return self
-            except exc.DisconnectionError, e:
+            except exc.DisconnectionError as e:
                 self._pool.logger.info(
                 "Disconnection detected on checkout: %s", e)
                 self._connection_record.invalidate(e)
@@ -755,7 +755,7 @@ class QueuePool(Pool):
             wait = self._max_overflow > -1 and \
                         self._overflow >= self._max_overflow
             return self._pool.get(wait, self._timeout)
-        except sqla_queue.SAAbort, aborted:
+        except sqla_queue.SAAbort as aborted:
             return aborted.context._do_get()
         except sqla_queue.Empty:
             if self._max_overflow > -1 and \
@@ -1004,7 +1004,7 @@ class _DBProxy(object):
         self._create_pool_mutex = threading.Lock()
 
     def close(self):
-        for key in self.pools.keys():
+        for key in list(self.pools.keys()):
             del self.pools[key]
 
     def __del__(self):
-- 
cgit v1.2.1