diff options
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/base.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/persistence.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/properties.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/relationships.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/state.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/strategy_options.py | 2 |
11 files changed, 21 insertions, 21 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index cd81d759d..879b88a92 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -1643,7 +1643,7 @@ class History(History): # key situations if id(original) in _NO_STATE_SYMBOLS: deleted = () - # indicate a "del" operation occured when we don't have + # indicate a "del" operation occurred when we don't have # the previous value as: ([None], (), ()) if id(current) in _NO_STATE_SYMBOLS: current = None @@ -1673,7 +1673,7 @@ class History(History): # ignore the None in any case. if id(original) in _NO_STATE_SYMBOLS or original is None: deleted = () - # indicate a "del" operation occured when we don't have + # indicate a "del" operation occurred when we don't have # the previous value as: ([None], (), ()) if id(current) in _NO_STATE_SYMBOLS: current = None diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py index 2ae817655..b64b35e72 100644 --- a/lib/sqlalchemy/orm/base.py +++ b/lib/sqlalchemy/orm/base.py @@ -195,7 +195,7 @@ NOT_EXTENSION = util.symbol( not part of sqlalchemy.ext. Is assigned to the :attr:`.InspectionAttr.extension_type` - attibute. + attribute. """, ) diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index 3ee0cd1f8..b9bad10b6 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -2134,7 +2134,7 @@ class AttributeEvents(event.Events): a changing value such as a timestamp, the :meth:`.AttributeEvents.init_scalar` event handler can also be used to **set** the newly returned value, so - that a Core-level default generation function effecively fires off + that a Core-level default generation function effectively fires off only once, but at the moment the attribute is accessed on the non-persisted object. Normally, no change to the object's state is made when an uninitialized attribute is accessed (much older @@ -2252,7 +2252,7 @@ class AttributeEvents(event.Events): from what was specified as :paramref:`.relationship.collection_class`, and will always be empty. - :param collection_adpater: the :class:`.CollectionAdapter` that will + :param collection_adapter: the :class:`.CollectionAdapter` that will mediate internal access to the collection. .. versionadded:: 1.0.0 the :meth:`.AttributeEvents.init_collection` @@ -2261,7 +2261,7 @@ class AttributeEvents(event.Events): """ - def dispose_collection(self, target, collection, collection_adpater): + def dispose_collection(self, target, collection, collection_adapter): """Receive a 'collection dispose' event. This event is triggered for a collection-based attribute when diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index ff5148ed1..12b8b4268 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -889,7 +889,7 @@ class Mapper(InspectionAttr): non_primary = None """Represent ``True`` if this :class:`.Mapper` is a "non-primary" - mapper, e.g. a mapper that is used only to selet rows but not for + mapper, e.g. a mapper that is used only to select rows but not for persistence management. This is a *read only* attribute determined during mapper construction. @@ -991,7 +991,7 @@ class Mapper(InspectionAttr): return PathRegistry.per_mapper(self) def _configure_inheritance(self): - """Configure settings related to inherting and/or inherited mappers + """Configure settings related to inheriting and/or inherited mappers being present.""" # a set of all mappers which inherit from this one. @@ -2339,7 +2339,7 @@ class Mapper(InspectionAttr): :class:`.Mapper` has several pre-filtered views of this attribute which limit the types of properties - returned, inclding :attr:`.synonyms`, :attr:`.column_attrs`, + returned, including :attr:`.synonyms`, :attr:`.column_attrs`, :attr:`.relationships`, and :attr:`.composites`. .. warning:: @@ -3166,7 +3166,7 @@ def configure_mappers(): additional options, properties, or related mappings before the operation proceeds. - * :meth:`.MapperEvents.mapper_configured` - called as each indivudal + * :meth:`.MapperEvents.mapper_configured` - called as each individual :class:`.Mapper` is configured within the process; will include all mapper state except for backrefs set up by other mappers that are still to be configured. diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py index 1e3a8a44e..c90c8d91e 100644 --- a/lib/sqlalchemy/orm/persistence.py +++ b/lib/sqlalchemy/orm/persistence.py @@ -596,7 +596,7 @@ def _collect_update_commands( propkey_to_col = mapper._propkey_to_col[table] if bulk: - # keys here are mapped attrbute keys, so + # keys here are mapped attribute keys, so # look at mapper attribute keys for pk params = dict( (propkey_to_col[propkey].key, state_dict[propkey]) @@ -679,7 +679,7 @@ def _collect_update_commands( has_all_pks = True if bulk: - # keys here are mapped attrbute keys, so + # keys here are mapped attribute keys, so # look at mapper attribute keys for pk pk_params = dict( (propkey_to_col[propkey]._label, state_dict.get(propkey)) diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index 530eadb6b..2b323429f 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -7,7 +7,7 @@ """MapperProperty implementations. -This is a private module which defines the behavior of invidual ORM- +This is a private module which defines the behavior of individual ORM- mapped attributes. """ diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 0db8b6dd0..80d596b4c 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -819,7 +819,7 @@ class Query(object): The :meth:`.Query.yield_per` method **is not compatible subqueryload eager loading or joinedload eager loading when using collections**. It is potentially compatible with "select in" - eager loading, **provided the databse driver supports multiple, + eager loading, **provided the database driver supports multiple, independent cursors** (pysqlite and psycopg2 are known to work, MySQL and SQL Server ODBC drivers do not). @@ -959,7 +959,7 @@ class Query(object): :param identity_token: identity token that should be used to create the identity key. Used as is, however overriding subclasses can repurpose this in order to interpret the value in a special way, - such as if None then look among multple target tokens. + such as if None then look among multiple target tokens. :param passive: passive load flag passed to :func:`.loading.get_from_identity`, which impacts the behavior if the object is found; the object may be validated and/or unexpired @@ -2842,7 +2842,7 @@ class Query(object): approach to the use case of applying an :func:`.aliased` construct explicitly throughout a query. Instead of referring to the :func:`.aliased` construct explicitly, - :meth:`.Query.select_entity_from` automatically *adapts* all occurences + :meth:`.Query.select_entity_from` automatically *adapts* all occurrences of the entity to the target selectable. Given a case for :func:`.aliased` such as selecting ``User`` diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py index 530a9bd89..b00d72d64 100644 --- a/lib/sqlalchemy/orm/relationships.py +++ b/lib/sqlalchemy/orm/relationships.py @@ -426,7 +426,7 @@ class RelationshipProperty(StrategizedProperty): In normal cases, the :paramref:`~.relationship.foreign_keys` parameter is **not required.** :func:`.relationship` will automatically determine which columns in the - :paramref:`~.relationship.primaryjoin` conditition are to be + :paramref:`~.relationship.primaryjoin` condition are to be considered "foreign key" columns based on those :class:`.Column` objects that specify :class:`.ForeignKey`, or are otherwise listed as referencing columns in a diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index a4cc07194..9e52ef208 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -891,7 +891,7 @@ class Session(_SessionClassMethods): not necessary for new applications. The :class:`.Session` normally handles the work of "begin" transparently, which in turn relies upon the Python DBAPI to transparently "begin" - transactions; there is **no need to explcitly begin transactions** + transactions; there is **no need to explicitly begin transactions** when using modern :class:`.Session` programming patterns. In its default mode of ``autocommit=False``, the :class:`.Session` does all of its work within @@ -2325,7 +2325,7 @@ class Session(_SessionClassMethods): To make a transient object associated with a :class:`.Session` via :meth:`.Session.enable_relationship_loading` pending, add it to the :class:`.Session` using :meth:`.Session.add` normally. - If the object instead represents an existing idenity in the database, + If the object instead represents an existing identity in the database, it should be merged using :meth:`.Session.merge`. :meth:`.Session.enable_relationship_loading` does not improve diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py index b5c441458..38c3f3791 100644 --- a/lib/sqlalchemy/orm/state.py +++ b/lib/sqlalchemy/orm/state.py @@ -312,7 +312,7 @@ class InstanceState(interfaces.InspectionAttrInfo): @util.memoized_property def mapper(self): - """Return the :class:`.Mapper` used for this mapepd object.""" + """Return the :class:`.Mapper` used for this mapped object.""" return self.manager.mapper @property diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py index 759efe9f5..cac23f6be 100644 --- a/lib/sqlalchemy/orm/strategy_options.py +++ b/lib/sqlalchemy/orm/strategy_options.py @@ -1472,7 +1472,7 @@ def undefer_group(loadopt, name): defaultload("someattr").undefer_group("large_attrs")) .. versionchanged:: 0.9.0 :func:`.orm.undefer_group` is now specific to a - particiular entity load path. + particular entity load path. .. seealso:: |