summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/pool.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-02-01 12:09:47 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-02-01 12:09:47 -0500
commit5e467f5105d6c66d0e38f24fc60bc023f4142ed6 (patch)
tree1fcf039a42ee32f1a46fb4c80ce0f8b3a5f327a5 /lib/sqlalchemy/pool.py
parent132f5c7e0437fb62237ab33bb9dea3befd5ab233 (diff)
downloadsqlalchemy-5e467f5105d6c66d0e38f24fc60bc023f4142ed6.tar.gz
accept the symbols so recreate works
Diffstat (limited to 'lib/sqlalchemy/pool.py')
-rw-r--r--lib/sqlalchemy/pool.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index cd935d4ae..6254a4ba1 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -134,14 +134,15 @@ class Pool(log.Identified):
self._creator = creator
self._recycle = recycle
self._use_threadlocal = use_threadlocal
- if reset_on_return in ('rollback', True):
+ if reset_on_return in ('rollback', True, reset_rollback):
self._reset_on_return = reset_rollback
- elif reset_on_return in (None, False):
+ elif reset_on_return in (None, False, reset_none):
self._reset_on_return = reset_none
- elif reset_on_return == 'commit':
+ elif reset_on_return in ('commit', reset_commit):
self._reset_on_return = reset_commit
else:
- raise exc.ArgumentError("Invalid value for 'reset_on_return': %r"
+ raise exc.ArgumentError(
+ "Invalid value for 'reset_on_return': %r"
% reset_on_return)
self.echo = echo