summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/pool.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-08-21 18:48:34 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-08-21 18:48:34 -0400
commit4268ea06b3efe116361157fa2ad155b2347d2bba (patch)
treec095c1d1578d65850c878aeb94d613a0041e3d4b /lib/sqlalchemy/pool.py
parentce6c1557a3e0eb49790521e2f0b366b19ce203cc (diff)
downloadsqlalchemy-4268ea06b3efe116361157fa2ad155b2347d2bba.tar.gz
move FAQ to the docs, [ticket:2133]
Diffstat (limited to 'lib/sqlalchemy/pool.py')
-rw-r--r--lib/sqlalchemy/pool.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 88d17a997..34681ef46 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -130,10 +130,10 @@ class Pool(log.Identified):
:meth:`unique_connection` method is provided to bypass the
threadlocal behavior installed into :meth:`connect`.
- :param reset_on_return: If true, reset the database state of
- connections returned to the pool. This is typically a
- ROLLBACK to release locks and transaction resources.
- Disable at your own peril. Defaults to True.
+ :param reset_on_return: Configures the action to take
+ on connections as they are returned to the pool.
+ See the argument description in :class:`.QueuePool` for
+ more detail.
:param events: a list of 2-tuples, each of the form
``(callable, target)`` which will be passed to event.listen()