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/session.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/session.py')
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 8a1dff163..081920487 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -592,7 +592,7 @@ class Session(_SessionClassMethods): weak_identity_map=True, binds=None, extension=None, info=None, query_cls=query.Query): - """Construct a new Session. + r"""Construct a new Session. See also the :class:`.sessionmaker` function which is used to generate a :class:`.Session`-producing callable with a given @@ -897,7 +897,7 @@ class Session(_SessionClassMethods): close_with_result=False, execution_options=None, **kw): - """Return a :class:`.Connection` object corresponding to this + r"""Return a :class:`.Connection` object corresponding to this :class:`.Session` object's transactional state. If this :class:`.Session` is configured with ``autocommit=False``, @@ -976,7 +976,7 @@ class Session(_SessionClassMethods): return conn def execute(self, clause, params=None, mapper=None, bind=None, **kw): - """Execute a SQL expression construct or string statement within + r"""Execute a SQL expression construct or string statement within the current transaction. Returns a :class:`.ResultProxy` representing @@ -2507,7 +2507,7 @@ class Session(_SessionClassMethods): def is_modified(self, instance, include_collections=True, passive=True): - """Return ``True`` if the given instance has locally + r"""Return ``True`` if the given instance has locally modified attributes. This method retrieves the history for each instrumented @@ -2565,6 +2565,7 @@ class Session(_SessionClassMethods): or many-to-one foreign keys) that would result in an UPDATE for this instance upon flush. :param passive: + .. versionchanged:: 0.8 Ignored for backwards compatibility. When using SQLAlchemy 0.7 and earlier, this flag should always @@ -2769,7 +2770,7 @@ class sessionmaker(_SessionClassMethods): autocommit=False, expire_on_commit=True, info=None, **kw): - """Construct a new :class:`.sessionmaker`. + r"""Construct a new :class:`.sessionmaker`. All arguments here except for ``class_`` correspond to arguments accepted by :class:`.Session` directly. See the |