From: Jason Kirtland <jek@discorporate.us>
Date: Wed, 1 Aug 2007 08:09:47 +0000 (+0000)
Subject: Tweak 'poolclass' default arg processing [ticket:437]
X-Git-Tag: rel_0_4beta1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f4a53d9f06b6dcafd0a672f8191a826a373ddcd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Tweak 'poolclass' default arg processing [ticket:437]
---

diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 0c59ee8ebf..910a1049de 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -74,7 +74,8 @@ class DefaultEngineStrategy(EngineStrategy):
                     raise exceptions.DBAPIError("Connection failed", e)
             creator = kwargs.pop('creator', connect)
 
-            poolclass = kwargs.pop('poolclass', getattr(dialect_cls, 'poolclass', poollib.QueuePool))
+            poolclass = (kwargs.pop('poolclass', None) or
+                         getattr(dialect_cls, 'poolclass', poollib.QueuePool))
             pool_args = {}
 
             # consume pool arguments from kwargs, translating a few of the arguments