From b8ef2d4b457328a9b8708dd9452b13c8913aef34 Mon Sep 17 00:00:00 2001 From: Diana Clarke Date: Mon, 14 Mar 2011 15:22:09 -0400 Subject: [PATCH] Corrected a bunch of spelling typos. --- lib/sqlalchemy/engine/base.py | 2 +- lib/sqlalchemy/exc.py | 4 ++-- lib/sqlalchemy/orm/attributes.py | 2 +- lib/sqlalchemy/orm/dependency.py | 2 +- lib/sqlalchemy/orm/interfaces.py | 2 +- lib/sqlalchemy/orm/properties.py | 6 +++--- lib/sqlalchemy/orm/query.py | 14 +++++++------- lib/sqlalchemy/orm/session.py | 4 ++-- lib/sqlalchemy/orm/sync.py | 2 +- lib/sqlalchemy/sql/expression.py | 2 +- lib/sqlalchemy/sql/util.py | 2 +- test/dialect/test_mysql.py | 2 +- test/engine/test_transaction.py | 2 +- test/orm/test_expire.py | 4 ++-- test/orm/test_unitofwork.py | 4 ++-- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 0af7798875..b0442e5142 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -617,7 +617,7 @@ class ExecutionContext(object): raise NotImplementedError() def handle_dbapi_exception(self, e): - """Receive a DBAPI exception which occured upon execute, result + """Receive a DBAPI exception which occurred upon execute, result fetch, etc.""" raise NotImplementedError() diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py index b50e000a2e..31c52113a3 100644 --- a/lib/sqlalchemy/exc.py +++ b/lib/sqlalchemy/exc.py @@ -39,7 +39,7 @@ class CompileError(SQLAlchemyError): class IdentifierError(SQLAlchemyError): """Raised when a schema name is beyond the max character limit""" -# Moved to orm.exc; compatability definition installed by orm import until 0.6 +# Moved to orm.exc; compatibility definition installed by orm import until 0.6 ConcurrentModificationError = None class DisconnectionError(SQLAlchemyError): @@ -51,7 +51,7 @@ class DisconnectionError(SQLAlchemyError): """ -# Moved to orm.exc; compatability definition installed by orm import until 0.6 +# Moved to orm.exc; compatibility definition installed by orm import until 0.6 FlushError = None class TimeoutError(SQLAlchemyError): diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index 7646a91610..7126b7f044 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -1300,7 +1300,7 @@ class _ClassInstrumentationAdapter(ClassManager): class History(tuple): """A 3-tuple of added, unchanged and deleted values, - representing the changes which have occured on an instrumented + representing the changes which have occurred on an instrumented attribute. Each tuple member is an iterable sequence. diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py index 11f8fc48b0..26894e3799 100644 --- a/lib/sqlalchemy/orm/dependency.py +++ b/lib/sqlalchemy/orm/dependency.py @@ -53,7 +53,7 @@ class DependencyProcessor(object): """establish actions and dependencies related to a flush. These actions will operate on all relevant states in - the aggreagte. + the aggregate. """ uow.register_preprocessor(self, True) diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py index 9f44fd0600..8211d7396f 100644 --- a/lib/sqlalchemy/orm/interfaces.py +++ b/lib/sqlalchemy/orm/interfaces.py @@ -953,7 +953,7 @@ def _reduce_path(path): This is used to allow more open ended selection of loader strategies, i.e. Mapper -> prop1 -> Subclass -> prop2, where Subclass is a sub-mapper - of the mapper referened by Mapper.prop1. + of the mapper referenced by Mapper.prop1. """ return tuple([i % 2 != 0 and diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index 9f51ea1192..9bb8f1a635 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -966,7 +966,7 @@ class RelationshipProperty(StrategizedProperty): if inheriting is not self.parent \ and inheriting.has_property(self.key): util.warn("Warning: relationship '%s' on mapper " - "'%s' supercedes the same relationship " + "'%s' supersedes the same relationship " "on inherited mapper '%s'; this can " "cause dependency issues during flush" % (self.key, self.parent, inheriting)) @@ -1038,7 +1038,7 @@ class RelationshipProperty(StrategizedProperty): def _sync_pairs_from_join(self, join_condition, primary): """Given a join condition, figure out what columns are foreign - and are part of a binary "equated" condition to their referecned + and are part of a binary "equated" condition to their referenced columns, and convert into a list of tuples of (primary col->foreign col). Make several attempts to determine if cols are compared using @@ -1433,7 +1433,7 @@ class RelationshipProperty(StrategizedProperty): # adjust the join condition for single table inheritance, # in the case that the join is to a subclass - # this is analgous to the "_adjust_for_single_table_inheritance()" + # this is analogous to the "_adjust_for_single_table_inheritance()" # method in Query. dest_mapper = of_type or self.mapper diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 1da9aad1ef..64ea7455b5 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -276,7 +276,7 @@ class Query(object): @property def _mapper_entities(self): - # TODO: this is wrong, its hardcoded to "priamry entity" when + # TODO: this is wrong, its hardcoded to "primary entity" when # for the case of __all_equivs() it should not be # the name of this accessor is wrong too for ent in self._entities: @@ -448,7 +448,7 @@ class Query(object): """Return the full SELECT statement represented by this :class:`.Query`, converted to a scalar subquery with a label of the given name. - Analagous to :meth:`sqlalchemy.sql._SelectBaseMixin.label`. + Analogous to :meth:`sqlalchemy.sql._SelectBaseMixin.label`. New in 0.6.5. @@ -461,7 +461,7 @@ class Query(object): """Return the full SELECT statement represented by this :class:`.Query`, converted to a scalar subquery. - Analagous to :meth:`sqlalchemy.sql._SelectBaseMixin.as_scalar`. + Analogous to :meth:`sqlalchemy.sql._SelectBaseMixin.as_scalar`. New in 0.6.5. @@ -835,12 +835,12 @@ class Query(object): self._setup_aliasizers(self._entities[l:]) @util.pending_deprecation("0.7", - ":meth:`.add_column` is superceded by :meth:`.add_columns`", + ":meth:`.add_column` is superseded by :meth:`.add_columns`", False) def add_column(self, column): """Add a column expression to the list of result columns to be returned. - Pending deprecation: :meth:`.add_column` will be superceded by + Pending deprecation: :meth:`.add_column` will be superseded by :meth:`.add_columns`. """ @@ -1201,7 +1201,7 @@ class Query(object): @util.accepts_a_list_as_starargs(list_deprecation='deprecated') def outerjoin(self, *props, **kwargs): """Create a left outer join against this ``Query`` object's criterion - and apply generatively, retunring the newly resulting ``Query``. + and apply generatively, returning the newly resulting ``Query``. Usage is the same as the ``join()`` method. @@ -2733,7 +2733,7 @@ class _ColumnEntity(_QueryEntity): # look for ORM entities represented within the # given expression. Try to count only entities - # for columns whos FROM object is in the actual list + # for columns whose FROM object is in the actual list # of FROMs for the overall expression - this helps # subqueries which were built from ORM constructs from # leaking out their entities into the main select construct diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index ea62bd42f6..e48257a528 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -915,7 +915,7 @@ class Session(object): def expire_all(self): """Expires all persistent instances within this Session. - When any attributes on a persitent instance is next accessed, + When any attributes on a persistent instance is next accessed, a query will be issued using the :class:`.Session` object's current transactional context in order to load all expired attributes for the given instance. Note that @@ -1046,7 +1046,7 @@ class Session(object): not mapper.allow_partial_pks or \ _none_set.issuperset(instance_key[1]): raise exc.FlushError('Instance %s has a NULL identity ' - 'key. Check if this flush is occuring at an ' + 'key. Check if this flush is occurring at an ' 'inappropriate time, such as during a load ' 'operation.' % mapperutil.state_str(state)) diff --git a/lib/sqlalchemy/orm/sync.py b/lib/sqlalchemy/orm/sync.py index 7ba0b1ad56..423245fc70 100644 --- a/lib/sqlalchemy/orm/sync.py +++ b/lib/sqlalchemy/orm/sync.py @@ -23,7 +23,7 @@ def populate(source, source_mapper, dest, dest_mapper, except exc.UnmappedColumnError: _raise_col_to_prop(True, source_mapper, l, dest_mapper, r) - # techically the "r.primary_key" check isn't + # technically the "r.primary_key" check isn't # needed here, but we check for this condition to limit # how often this logic is invoked for memory/performance # reasons, since we only need this info for a primary key diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 6aa94a51d4..2efbc3546c 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -2216,7 +2216,7 @@ class FromClause(Selectable): return fromclause in self._cloned_set def replace_selectable(self, old, alias): - """replace all occurences of FromClause 'old' with the given Alias + """replace all occurrences of FromClause 'old' with the given Alias object, returning a copy of this :class:`FromClause`. """ diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 442d40587b..9832d3c251 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -334,7 +334,7 @@ class Annotated(object): # detect immutable, don't change anything return self else: - # update the clone with any changes that have occured + # update the clone with any changes that have occurred # to this object's __dict__. clone.__dict__.update(self.__dict__) return Annotated(clone, self._annotations) diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py index e3168e2449..e3bae2f55e 100644 --- a/test/dialect/test_mysql.py +++ b/test/dialect/test_mysql.py @@ -384,7 +384,7 @@ class TypesTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL): meta.drop_all() def test_boolean(self): - """Test BOOL/TINYINT(1) compatability and reflection.""" + """Test BOOL/TINYINT(1) compatibility and reflection.""" meta = MetaData(testing.db) bool_table = Table( diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py index 0aaf036ede..05ab42f710 100644 --- a/test/engine/test_transaction.py +++ b/test/engine/test_transaction.py @@ -444,7 +444,7 @@ class ExplicitAutoCommitTest(TestBase): eq_(conn2.execute(select([foo.c.data])).fetchall(), [('data1', )]) - # connection supercedes statement + # connection supersedes statement conn1.execution_options(autocommit=False).\ execute(select([func.insert_foo('data2' diff --git a/test/orm/test_expire.py b/test/orm/test_expire.py index 5e07c73df3..5a49bd4006 100644 --- a/test/orm/test_expire.py +++ b/test/orm/test_expire.py @@ -105,7 +105,7 @@ class ExpireTest(_fixtures.FixtureTest): s.rollback() assert u in s - # but now its back, rollback has occured, the _remove_newly_deleted + # but now its back, rollback has occurred, the _remove_newly_deleted # is reverted eq_(u.name, 'chuck') @@ -1130,7 +1130,7 @@ class RefreshTest(_fixtures.FixtureTest): @testing.fails_on('maxdb', 'FIXME: unknown') @testing.resolve_artifact_names def test_refresh2(self): - """test a hang condition that was occuring on expire/refresh""" + """test a hang condition that was occurring on expire/refresh""" s = create_session() mapper(Address, addresses) diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py index 8484949548..85c2c2516b 100644 --- a/test/orm/test_unitofwork.py +++ b/test/orm/test_unitofwork.py @@ -2289,7 +2289,7 @@ class DontAllowFlushOnLoadingObjectTest(_base.MappedTest): @reconstructor def go(self): # blow away 'id', no change event. - # this simulates a callable occuring + # this simulates a callable occurring # before 'id' was even populated, i.e. a callable # within an attribute_mapped_collection self.__dict__.pop('id', None) @@ -2321,7 +2321,7 @@ class DontAllowFlushOnLoadingObjectTest(_base.MappedTest): # and thing would right themselves. assert_raises_message(sa.orm.exc.FlushError, 'has a NULL identity key. Check if this ' - 'flush is occuring at an inappropriate ' + 'flush is occurring at an inappropriate ' 'time, such as during a load operation.', sess.query(T1).first) -- 2.47.2