diff options
Diffstat (limited to 'lib/sqlalchemy/orm/session.py')
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 760c71afd..e6d6251cf 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -934,8 +934,6 @@ class SessionTransaction(_StateChange, TransactionalContext): :attr:`.SessionTransaction.nested` attribute is ``True``, then this is a SAVEPOINT, and if ``False``, indicates this a subtransaction. - .. versionadded:: 1.0.16 - use ._parent for previous versions - """ return self._parent @@ -3704,10 +3702,6 @@ class Session(_SessionClassMethods, EventTarget): See :ref:`unitofwork_merging` for a detailed discussion of merging. - .. versionchanged:: 1.1 - :meth:`.Session.merge` will now reconcile - pending objects with overlapping primary keys in the same way - as persistent. See :ref:`change_3601` for discussion. - :param instance: Instance to be merged. :param load: Boolean, when False, :meth:`.merge` switches into a "high performance" mode which causes it to forego emitting history |