diff options
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/events.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/relationships.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index 3a786c73d..bf7dab4e7 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -98,7 +98,7 @@ class QueryableAttribute(interfaces._MappedAttribute, any other kind of SQL expression other than a :class:`.Column`, the attribute will refer to the :attr:`.MapperProperty.info` dictionary associated directly with the :class:`.ColumnProperty`, assuming the SQL - expression itself does not have it's own ``.info`` attribute + expression itself does not have its own ``.info`` attribute (which should be the case, unless a user-defined SQL construct has defined one). diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index 078f4d12f..6bc6b17ff 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -1648,7 +1648,7 @@ class AttributeEvents(event.Events): replaces it. :param initiator: An instance of :class:`.attributes.Event` representing the initiation of the event. May be modified - from it's original value by backref handlers in order to control + from its original value by backref handlers in order to control chained event propagation. .. versionchanged:: 0.9.0 the ``initiator`` argument is now @@ -1669,7 +1669,7 @@ class AttributeEvents(event.Events): :param value: the value being removed. :param initiator: An instance of :class:`.attributes.Event` representing the initiation of the event. May be modified - from it's original value by backref handlers in order to control + from its original value by backref handlers in order to control chained event propagation. .. versionchanged:: 0.9.0 the ``initiator`` argument is now @@ -1697,7 +1697,7 @@ class AttributeEvents(event.Events): or expired. :param initiator: An instance of :class:`.attributes.Event` representing the initiation of the event. May be modified - from it's original value by backref handlers in order to control + from its original value by backref handlers in order to control chained event propagation. .. versionchanged:: 0.9.0 the ``initiator`` argument is now diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index a939cb9c7..3e93840a1 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -210,7 +210,7 @@ class Mapper(_InspectionAttr): See the section :ref:`concrete_inheritance` for an example. :param confirm_deleted_rows: defaults to True; when a DELETE occurs - of one more more rows based on specific primary keys, a warning is + of one more rows based on specific primary keys, a warning is emitted when the number of rows matched does not equal the number of rows expected. This parameter may be set to False to handle the case where database ON DELETE CASCADE rules may be deleting some of those @@ -913,7 +913,7 @@ class Mapper(_InspectionAttr): if self.inherit_condition is None: # figure out inherit condition from our table to the # immediate table of the inherited mapper, not its - # full table which could pull in other stuff we dont + # full table which could pull in other stuff we don't # want (allows test/inheritance.InheritTest4 to pass) self.inherit_condition = sql_util.join_condition( self.inherits.local_table, @@ -1311,7 +1311,7 @@ class Mapper(_InspectionAttr): setter = True if isinstance(self.polymorphic_on, util.string_types): - # polymorphic_on specified as as string - link + # polymorphic_on specified as a string - link # it to mapped ColumnProperty try: self.polymorphic_on = self._props[self.polymorphic_on] @@ -2463,7 +2463,7 @@ class Mapper(_InspectionAttr): # attempt to skip dependencies that are not # significant to the inheritance chain # for two tables that are related by inheritance. - # while that dependency may be important, it's techinically + # while that dependency may be important, it's technically # not what we mean to sort on here. parent = table_to_mapper.get(fk.parent.table) dep = table_to_mapper.get(fk.column.table) diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py index 0d9ee87b3..b7992c9bd 100644 --- a/lib/sqlalchemy/orm/relationships.py +++ b/lib/sqlalchemy/orm/relationships.py @@ -666,7 +666,7 @@ class RelationshipProperty(StrategizedProperty): .. seealso:: - :ref:`self_referential` - in-depth explaination of how + :ref:`self_referential` - in-depth explanation of how :paramref:`~.relationship.remote_side` is used to configure self-referential relationships. diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 613ca82c4..89d9946ee 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -1016,7 +1016,7 @@ class Session(_SessionClassMethods): self._deleted = {} # TODO: need much more test coverage for bind_mapper() and similar ! - # TODO: + crystalize + document resolution order + # TODO: + crystallize + document resolution order # vis. bind_mapper/bind_table def bind_mapper(self, mapper, bind): @@ -1194,7 +1194,7 @@ class Session(_SessionClassMethods): e.add_detail( "raised as a result of Query-invoked autoflush; " "consider using a session.no_autoflush block if this " - "flush is occuring prematurely") + "flush is occurring prematurely") util.raise_from_cause(e) def refresh(self, instance, attribute_names=None, lockmode=None): diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index 4a07e7856..3ebadd62b 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -1033,7 +1033,7 @@ class JoinedLoader(AbstractRelationshipLoader): def setup_query(self, context, entity, path, loadopt, adapter, \ column_collection=None, parentmapper=None, **kwargs): - """Add a left outer join to the statement thats being constructed.""" + """Add a left outer join to the statement that's being constructed.""" if not context.query._enable_eagerloads: return @@ -1337,7 +1337,7 @@ class JoinedLoader(AbstractRelationshipLoader): self.mapper.identity_key_from_row(row, decorator) return decorator except KeyError: - # no identity key - dont return a row + # no identity key - don't return a row # processor, will cause a degrade to lazy return False diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index dd85f2ef1..8694705a4 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -141,7 +141,7 @@ def polymorphic_union(table_map, typecolname, for key in table_map: table = table_map[key] - # mysql doesnt like selecting from a select; + # mysql doesn't like selecting from a select; # make it an alias of the select if isinstance(table, sql.Select): table = table.alias() |