diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-08-13 17:54:47 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-08-13 17:54:47 -0400 |
| commit | d212f7e554426dfc7892288a7221e6d514df3395 (patch) | |
| tree | 66f47cc05bb0c2ed704f4e23af95603151405ea3 /lib/sqlalchemy/orm | |
| parent | 51417b942fc7408814b1567570f381fc942e9ccb (diff) | |
| parent | 8c7914e1818961e8d3acee33bea8e006b13993fa (diff) | |
| download | sqlalchemy-d212f7e554426dfc7892288a7221e6d514df3395.tar.gz | |
merge tip.
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/events.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index 53b42d051..05f640ab0 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -1056,7 +1056,7 @@ class SessionEvents(event.Events): :param session: The target :class:`.Session`. :param transaction: The :class:`.SessionTransaction`. - :param connection: The :class:`~.engine.base.Connection` object + :param connection: The :class:`~.engine.Connection` object which will be used for SQL statements. """ diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 069de2597..bcc1a2454 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -1746,7 +1746,7 @@ class Mapper(_InspectionAttr): item from the identity map. row - A ``sqlalchemy.engine.base.RowProxy`` instance or a + A ``sqlalchemy.engine.RowProxy`` instance or a dictionary corresponding result-set ``ColumnElement`` instances to their values within a row. |