diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-08-13 17:35:27 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-08-13 17:35:27 -0400 |
| commit | 8c7914e1818961e8d3acee33bea8e006b13993fa (patch) | |
| tree | 506e17ff2f5dc2009cb9f98e9689204d2d9d4032 /lib/sqlalchemy/orm | |
| parent | 96650157083f9c691a7a8a737724159cd6a1d668 (diff) | |
| download | sqlalchemy-8c7914e1818961e8d3acee33bea8e006b13993fa.tar.gz | |
- update engine docstrings due to move
- struggle with Operators class autodoc
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. |