diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-10 14:23:44 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-12-10 14:23:44 -0500 |
| commit | fb443199c19296edbd3ea5e805f57777d450a4db (patch) | |
| tree | 59a5e26f2da5ac6f94ab1f43a44d1d704409ede2 /lib/sqlalchemy | |
| parent | b606e47ddc541952c1d4c1b6d010fc72249af234 (diff) | |
| parent | 7e6f3312333d09a051d01509d8c423708d3fbca3 (diff) | |
| download | sqlalchemy-fb443199c19296edbd3ea5e805f57777d450a4db.tar.gz | |
Merge remote-tracking branch 'origin/pr/220'
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/events.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index c13cb5a44..5b0cbfdad 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -1950,7 +1950,7 @@ class AttributeEvents(event.Events): and also during replace operations:: - u1.addresess = [a2, a3] # <- new collection + u1.addresses = [a2, a3] # <- new collection :param target: the object instance receiving the event. If the listener is registered with ``raw=True``, this will diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index f58e4de61..56513860a 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -694,7 +694,7 @@ class Session(_SessionClassMethods): def info(self): """A user-modifiable dictionary. - The initial value of this dictioanry can be populated using the + The initial value of this dictionary can be populated using the ``info`` argument to the :class:`.Session` constructor or :class:`.sessionmaker` constructor or factory methods. The dictionary here is always local to this :class:`.Session` and can be modified |