summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/session.py
diff options
context:
space:
mode:
authorLele Gaifax <lele@metapensiero.it>2019-01-14 11:26:33 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2019-01-25 14:56:50 -0500
commit66e88d30a86fc37e2eaf7367e988ced3834e3250 (patch)
treeeaee9860ff866d88e398cb6531a988ccd8601e09 /lib/sqlalchemy/orm/session.py
parentc9a31767e0d3a15ab45101aca21924cb4434c7b9 (diff)
downloadsqlalchemy-66e88d30a86fc37e2eaf7367e988ced3834e3250.tar.gz
Fix many spell glitches
This affects mostly docstrings, except in orm/events.py::dispose_collection() where one parameter gets renamed: given that the method is empty, it seemed reasonable to me to fix that too. Closes: #4440 Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/4440 Pull-request-sha: 779ed75acb6142e1f1daac467b5b14134529bb4b Change-Id: Ic0553fe97853054b09c2453af76d96363de6eb0e
Diffstat (limited to 'lib/sqlalchemy/orm/session.py')
-rw-r--r--lib/sqlalchemy/orm/session.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index a4cc07194..9e52ef208 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -891,7 +891,7 @@ class Session(_SessionClassMethods):
not necessary for new applications. The :class:`.Session`
normally handles the work of "begin" transparently, which in
turn relies upon the Python DBAPI to transparently "begin"
- transactions; there is **no need to explcitly begin transactions**
+ transactions; there is **no need to explicitly begin transactions**
when using modern :class:`.Session` programming patterns.
In its default mode of ``autocommit=False``, the
:class:`.Session` does all of its work within
@@ -2325,7 +2325,7 @@ class Session(_SessionClassMethods):
To make a transient object associated with a :class:`.Session`
via :meth:`.Session.enable_relationship_loading` pending, add
it to the :class:`.Session` using :meth:`.Session.add` normally.
- If the object instead represents an existing idenity in the database,
+ If the object instead represents an existing identity in the database,
it should be merged using :meth:`.Session.merge`.
:meth:`.Session.enable_relationship_loading` does not improve