summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2019-11-04 13:52:48 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2019-11-04 13:52:48 -0500
commitbee7c3462d6235b7e108dbdbcd0727cdcbc49eb0 (patch)
treebf94e86a8a6e14451895b4054e9f6cad0525dc4e /lib/sqlalchemy
parent6b5d94da84452b125f6788f0e1472b94a43ffc16 (diff)
parent7f260c95d65f9bb77e4e0bbb8ef78f57b183fc7c (diff)
downloadsqlalchemy-bee7c3462d6235b7e108dbdbcd0727cdcbc49eb0.tar.gz
Merge remote-tracking branch 'origin/pr/4958'
Change-Id: Id59e77c64ffeb0f4636261be9fb21d2a78100f40
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/session.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 5cf31da0f..ac495f321 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -3060,7 +3060,7 @@ class Session(_SessionClassMethods):
"partial rollback" state.
From all the above, it follows that the only purpose to this flag is
- for application frameworks that wish to detect is a "rollback" is
+ for application frameworks that wish to detect if a "rollback" is
necessary within a generic error handling routine, for
:class:`.Session` objects that would otherwise be in
"partial rollback" mode. In a typical integration case, this is also