summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/pool.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-03-09 17:26:16 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-03-09 17:26:16 -0500
commitc8a80e21301791fd4e1caf29ed8cadd40f617765 (patch)
treebcd5a91a5b841501a1d237e95595f2177cf5c2b8 /lib/sqlalchemy/pool.py
parent8ef3ed1032e0354cffa786f25bac2c54a3bcd54d (diff)
downloadsqlalchemy-c8a80e21301791fd4e1caf29ed8cadd40f617765.tar.gz
- remove all compat items that are pre-2.5 (hooray)
- other cleanup - don't need compat.decimal, that approach never panned out. hopefully outside libs aren't pulling it in, they shouldn't be
Diffstat (limited to 'lib/sqlalchemy/pool.py')
-rw-r--r--lib/sqlalchemy/pool.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index f72082ceb..501b6d2a0 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -736,8 +736,8 @@ class QueuePool(Pool):
self._overflow = 0 - pool_size
self._max_overflow = max_overflow
self._timeout = timeout
- self._overflow_lock = self._max_overflow > -1 and \
- threading.Lock() or DummyLock()
+ self._overflow_lock = threading.Lock() if self._max_overflow > -1 \
+ else DummyLock()
def _do_return_conn(self, conn):
try: