]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Tweak 'poolclass' default arg processing [ticket:437]
authorJason Kirtland <jek@discorporate.us>
Wed, 1 Aug 2007 08:09:47 +0000 (08:09 +0000)
committerJason Kirtland <jek@discorporate.us>
Wed, 1 Aug 2007 08:09:47 +0000 (08:09 +0000)
lib/sqlalchemy/engine/strategies.py

index 0c59ee8ebf48acce85acd3fd164397c835df73dc..910a1049de89230716d975dfa88d51f74a805bd5 100644 (file)
@@ -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