From 7c21b81cf8ec508c1b6ecc5f488960346ffac11f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 4 Jul 2011 16:31:58 -0400 Subject: - fix pypostgresql typo, [ticket:2185] - rewrite "getting a session" docs to delineate all sessionmaker() use cases distinctly - rewrite "Managing Transactions" doc to spell out each specific step completely, [ticket:2204] - add to create_engine() and main "engine" doc an unambiguous statement that the create_engine() does not create a connection - other link fixes - rewrite "deleting" section so that "deleting from collections" is separate, well-described, [ticket:2202] - rephrase "autocommit mode" into its own section, move it down, put some bold text that you shouldn't be using it. - simplify the "subtransactions" section and make it local to "autocommit" since it is utterly unneeded by anybody. - oracle is not doing 2-phase anytime soon --- lib/sqlalchemy/orm/scoping.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/sqlalchemy/orm/scoping.py') diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index 53e5e5d1f..815bda185 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -16,16 +16,16 @@ __all__ = ['ScopedSession'] class ScopedSession(object): """Provides thread-local management of Sessions. - - Usage:: - + + Typical invocation is via the :func:`.scoped_session` + function:: + Session = scoped_session(sessionmaker()) - ... use Session normally. - - The internal registry is accessible as well, + The internal registry is accessible, and by default is an instance of :class:`.ThreadLocalRegistry`. + See also: :ref:`unitofwork_contextual`. """ -- cgit v1.2.1