From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 1 Feb 2012 17:09:47 +0000 (-0500)
Subject: accept the symbols so recreate works
X-Git-Tag: rel_0_7_6~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e467f5105d6c66d0e38f24fc60bc023f4142ed6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

accept the symbols so recreate works
---

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index cd935d4aef..6254a4ba10 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