summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/scoping.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-08-09 20:32:37 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2010-08-09 20:32:37 -0400
commit331141d936478b9d892fc51d094ef0c7e01f5d3e (patch)
treef1493e742695c4343123f79e7c48a416f52cd955 /lib/sqlalchemy/orm/scoping.py
parentc14a3651a4ea624e0539c4ee7d45e23bf6139403 (diff)
downloadsqlalchemy-331141d936478b9d892fc51d094ef0c7e01f5d3e.tar.gz
get slightly better about deprecations in docstrings, tho this is kind of an uphill climb
Diffstat (limited to 'lib/sqlalchemy/orm/scoping.py')
-rw-r--r--lib/sqlalchemy/orm/scoping.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index 40bbb3299..af518e407 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -58,13 +58,11 @@ class ScopedSession(object):
self.registry().close()
self.registry.clear()
- @deprecated("Session.mapper is deprecated. "
+ @deprecated("0.5", ":meth:`.ScopedSession.mapper` is deprecated. "
"Please see http://www.sqlalchemy.org/trac/wiki/UsageRecipes/SessionAwareMapper "
"for information on how to replicate its behavior.")
def mapper(self, *args, **kwargs):
- """return a mapper() function which associates this ScopedSession with the Mapper.
-
- DEPRECATED.
+ """return a :func:`.mapper` function which associates this ScopedSession with the Mapper.
"""