From 10aeb7346d58e5fb1fc762aa7a44574fd745b9c1 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 13 Aug 2008 22:49:38 +0000 Subject: [PATCH] dont rely upon AttributeError to test for None --- lib/sqlalchemy/pool.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py index ddf7cb51ed..c0d98ffc47 100644 --- a/lib/sqlalchemy/pool.py +++ b/lib/sqlalchemy/pool.py @@ -161,11 +161,15 @@ class Pool(object): return _ConnectionFairy(self).checkout() try: - return self._threadconns.current().checkout() + rec = self._threadconns.current() + if rec: + return rec.checkout() except AttributeError: - agent = _ConnectionFairy(self) - self._threadconns.current = weakref.ref(agent) - return agent.checkout() + pass + + agent = _ConnectionFairy(self) + self._threadconns.current = weakref.ref(agent) + return agent.checkout() def return_conn(self, record): if self._use_threadlocal and hasattr(self._threadconns, "current"): -- 2.47.3