diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-01-11 10:12:12 -0500 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-01-13 10:57:41 -0500 |
commit | fa6dd376bb24845724287d980a98ea50eb1cfab1 (patch) | |
tree | 91e536c76f4b76b8997b02f5cd5a41de29dc90ef /lib/sqlalchemy/orm/scoping.py | |
parent | c703b9ce89483b6f44b97d1fbf56f8df8b14305a (diff) | |
download | sqlalchemy-fa6dd376bb24845724287d980a98ea50eb1cfab1.tar.gz |
Support python3.6
Corrects some warnings and adds tox config. Adds DeprecationWarning
to the error category. Large sweep for string literals w/ backslashes
as this is common in docstrings
Co-authored-by: Andrii Soldatenko
Fixes: #3886
Change-Id: Ia7c838dfbbe70b262622ed0803d581edc736e085
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/337
Diffstat (limited to 'lib/sqlalchemy/orm/scoping.py')
-rw-r--r-- | lib/sqlalchemy/orm/scoping.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index f51dbc68c..05b881320 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -51,7 +51,7 @@ class scoped_session(object): self.registry = ThreadLocalRegistry(session_factory) def __call__(self, **kw): - """Return the current :class:`.Session`, creating it + r"""Return the current :class:`.Session`, creating it using the :attr:`.scoped_session.session_factory` if not present. :param \**kw: Keyword arguments will be passed to the |