summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-08-09 09:32:51 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-08-09 09:32:51 -0400
commiteaceeae0f721be72cc589a310e50f0de9f24d721 (patch)
tree0b25fb39aea6550f8bedb29fb8b297ae40fd2a8e /lib/sqlalchemy
parent03560c4b83308719067ec635662c35f9a437fb7f (diff)
parent7765724d51f78690c814eda6533fc0ac81ca9077 (diff)
downloadsqlalchemy-eaceeae0f721be72cc589a310e50f0de9f24d721.tar.gz
Merge branch 'master--typos' of https://github.com/nphilipp/sqlalchemy
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/events.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index 9c837446d..9d95eda3b 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -732,7 +732,7 @@ class MapperEvents(event.Events):
def go():
# ...
- Constrast this event to :meth:`.MapperEvents.after_configured`,
+ Contrast this event to :meth:`.MapperEvents.after_configured`,
which is invoked after the series of mappers has been configured,
as well as :meth:`.MapperEvents.mapper_configured`, which is invoked
on a per-mapper basis as each one is configured to the extent possible.
@@ -779,7 +779,7 @@ class MapperEvents(event.Events):
operation proceeds; unlike that event, when this event is invoked,
all cross-configurations (e.g. backrefs) will also have been made
available for any mappers that were pending.
- Also constrast to :meth:`.MapperEvents.before_configured`,
+ Also contrast to :meth:`.MapperEvents.before_configured`,
which is invoked before the series of mappers has been configured.
This event can **only** be applied to the :class:`.Mapper` class