summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2013-08-25 09:08:00 -0700
committermike bayer <mike_mp@zzzcomputing.com>2013-08-25 09:08:00 -0700
commitb3aa03853fcbc35d930de953b51f9e2fe5ba3def (patch)
tree73c5fc19cb44fbe35c9ed058055ff028f127d3f5
parente9b2e33f15cd74978ca858e768e9c44abb1d00f3 (diff)
parentb9bd6ffd43a138f0b8964cae0657e478f9b4a13a (diff)
downloadsqlalchemy-b3aa03853fcbc35d930de953b51f9e2fe5ba3def.tar.gz
Merge pull request #23 from yoloseem/master
Fixed two typos.
-rw-r--r--lib/sqlalchemy/orm/mapper.py2
-rw-r--r--lib/sqlalchemy/orm/state.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 2d7e7b3cf..fc80c4404 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1819,7 +1819,7 @@ class Mapper(_InspectionAttr):
Normally, this is equivalent to :attr:`.mapped_table`, unless
the ``with_polymorphic`` feature is in use, in which case the
- full "polymoprhic" selectable is returned.
+ full "polymorphic" selectable is returned.
"""
return self._with_polymorphic_selectable
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index 7805a47e4..35305dc79 100644
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -507,13 +507,13 @@ class AttributeState(object):
to a particular attribute on a particular mapped object.
The :class:`.AttributeState` object is accessed
- via the :attr:`.InstanceState.attr` collection
+ via the :attr:`.InstanceState.attrs` collection
of a particular :class:`.InstanceState`::
from sqlalchemy import inspect
insp = inspect(some_mapped_object)
- attr_state = insp.attr.some_attribute
+ attr_state = insp.attrs.some_attribute
"""