summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/strategies.py
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2007-08-01 08:09:47 +0000
committerJason Kirtland <jek@discorporate.us>2007-08-01 08:09:47 +0000
commit1f4a53d9f06b6dcafd0a672f8191a826a373ddcd (patch)
tree53f6a6e6e0d32d7381612fea171717d4fe64c80d /lib/sqlalchemy/engine/strategies.py
parent18dab5baf0bed47eeeaab6ada389f7c71434ef78 (diff)
downloadsqlalchemy-1f4a53d9f06b6dcafd0a672f8191a826a373ddcd.tar.gz
Tweak 'poolclass' default arg processing [ticket:437]
Diffstat (limited to 'lib/sqlalchemy/engine/strategies.py')
-rw-r--r--lib/sqlalchemy/engine/strategies.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 0c59ee8eb..910a1049d 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