summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiana Clarke <diana.joan.clarke@gmail.com>2011-02-28 13:17:46 -0500
committerDiana Clarke <diana.joan.clarke@gmail.com>2011-02-28 13:17:46 -0500
commit13242f766eb5063a789937e2d56089207426dba0 (patch)
tree4a599c8e3ce5a887581bbe6b1fb178a696d38827
parent62c545108d97ebe98731204b1de90e9abe2025b7 (diff)
downloadsqlalchemy-13242f766eb5063a789937e2d56089207426dba0.tar.gz
corrected a bunch of spelling typos
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py2
-rw-r--r--lib/sqlalchemy/engine/base.py2
-rw-r--r--lib/sqlalchemy/exc.py8
-rw-r--r--lib/sqlalchemy/ext/mutable.py2
-rw-r--r--lib/sqlalchemy/interfaces.py2
-rw-r--r--lib/sqlalchemy/orm/__init__.py4
-rw-r--r--lib/sqlalchemy/orm/attributes.py2
-rw-r--r--lib/sqlalchemy/orm/dependency.py2
-rw-r--r--lib/sqlalchemy/orm/deprecated_interfaces.py6
-rw-r--r--lib/sqlalchemy/orm/descriptor_props.py2
-rw-r--r--lib/sqlalchemy/orm/events.py8
-rw-r--r--lib/sqlalchemy/orm/interfaces.py2
-rw-r--r--lib/sqlalchemy/orm/mapper.py4
-rw-r--r--lib/sqlalchemy/orm/properties.py6
-rw-r--r--lib/sqlalchemy/orm/query.py16
-rw-r--r--lib/sqlalchemy/orm/session.py6
-rw-r--r--lib/sqlalchemy/orm/sync.py2
-rw-r--r--lib/sqlalchemy/pool.py2
-rw-r--r--lib/sqlalchemy/sql/expression.py6
-rw-r--r--lib/sqlalchemy/sql/util.py2
-rw-r--r--lib/sqlalchemy/types.py8
-rw-r--r--test/dialect/test_mysql.py2
-rw-r--r--test/engine/test_transaction.py2
-rw-r--r--test/orm/test_attributes.py2
-rw-r--r--test/orm/test_events.py4
-rw-r--r--test/orm/test_expire.py4
-rw-r--r--test/orm/test_joins.py2
-rw-r--r--test/orm/test_unitofwork.py4
28 files changed, 57 insertions, 57 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index b6a6357b5..999d1a305 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -249,7 +249,7 @@ class ARRAY(sqltypes.MutableType, sqltypes.Concatenable, sqltypes.TypeEngine):
performance implications (default changed from ``True`` in
0.7.0).
- .. note:: This functionality is now superceded by the
+ .. note:: This functionality is now superseded by the
``sqlalchemy.ext.mutable`` extension described in
:ref:`mutable_toplevel`.
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 9eb5a38ff..972b06ce8 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -635,7 +635,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 dd3f5a9f8..99214dfdd 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):
@@ -89,11 +89,11 @@ class UnboundExecutionError(InvalidRequestError):
"""SQL was attempted without a database connection to execute it on."""
-# 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
UnmappedColumnError = None
class StatementError(SQLAlchemyError):
- """An error occured during execution of a SQL statement.
+ """An error occurred during execution of a SQL statement.
:class:`.StatementError` wraps the exception raised
during execution, and features :attr:`.statement`
diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py
index 594e664fb..c3bb2b9f7 100644
--- a/lib/sqlalchemy/ext/mutable.py
+++ b/lib/sqlalchemy/ext/mutable.py
@@ -465,7 +465,7 @@ class Mutable(MutableBase):
is given, and that only columns which are declared specifically with that
type instance receive additional instrumentation.
- To associate a particular mutable type with all occurences of a
+ To associate a particular mutable type with all occurrences of a
particular type, use the :meth:`.Mutable.associate_with` classmethod
of the particular :meth:`.Mutable` subclass to establish a global
assoiation.
diff --git a/lib/sqlalchemy/interfaces.py b/lib/sqlalchemy/interfaces.py
index 0a1eec75d..07e574ba5 100644
--- a/lib/sqlalchemy/interfaces.py
+++ b/lib/sqlalchemy/interfaces.py
@@ -7,7 +7,7 @@
"""Interfaces and abstract types.
-This module is **deprecated** and is superceded by the
+This module is **deprecated** and is superseded by the
event system.
"""
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 2ed270cda..4de507fa5 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -886,7 +886,7 @@ def synonym(name, map_column=False, descriptor=None,
comparator_factory=None, doc=None):
"""Denote an attribute name as a synonym to a mapped property.
- .. note:: :func:`.synonym` is superceded as of 0.7 by
+ .. note:: :func:`.synonym` is superseded as of 0.7 by
the :mod:`~sqlalchemy.ext.hybrid` extension. See
the documentation for hybrids at :ref:`hybrids_toplevel`.
@@ -928,7 +928,7 @@ def comparable_property(comparator_factory, descriptor=None):
"""Provides a method of applying a :class:`.PropComparator`
to any Python descriptor attribute.
- .. note:: :func:`.comparable_property` is superceded as of 0.7 by
+ .. note:: :func:`.comparable_property` is superseded as of 0.7 by
the :mod:`~sqlalchemy.ext.hybrid` extension. See the example
at :ref:`hybrid_custom_comparators`.
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 74e85f065..437de685c 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -971,7 +971,7 @@ def backref_listeners(attribute, key, uselist):
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 338ecfb55..5dddd02dd 100644
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -58,7 +58,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/deprecated_interfaces.py b/lib/sqlalchemy/orm/deprecated_interfaces.py
index 135664469..9ebf9a57e 100644
--- a/lib/sqlalchemy/orm/deprecated_interfaces.py
+++ b/lib/sqlalchemy/orm/deprecated_interfaces.py
@@ -423,13 +423,13 @@ class SessionExtension(object):
transaction is ongoing."""
def after_commit(self, session):
- """Execute after a commit has occured.
+ """Execute after a commit has occurred.
Note that this may not be per-flush if a longer running
transaction is ongoing."""
def after_rollback(self, session):
- """Execute after a rollback has occured.
+ """Execute after a rollback has occurred.
Note that this may not be per-flush if a longer running
transaction is ongoing."""
@@ -454,7 +454,7 @@ class SessionExtension(object):
This will be when the 'new', 'dirty', and 'deleted' lists are in
their final state. An actual commit() may or may not have
- occured, depending on whether or not the flush started its own
+ occurred, depending on whether or not the flush started its own
transaction or participated in a larger transaction. """
def after_begin( self, session, transaction, connection):
diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py
index d8a4bc8cf..634da34f1 100644
--- a/lib/sqlalchemy/orm/descriptor_props.py
+++ b/lib/sqlalchemy/orm/descriptor_props.py
@@ -4,7 +4,7 @@
# This module is part of SQLAlchemy and is released under
# the MIT License: http://www.opensource.org/licenses/mit-license.php
-"""Descriptor proprerties are more "auxilliary" properties
+"""Descriptor properties are more "auxiliary" properties
that exist as configurational elements, but don't participate
as actively in the load/persist ORM loop.
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index de2147d36..fdbee98b3 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -800,7 +800,7 @@ class SessionEvents(event.Events):
not issubclass(target.session_factory, Session):
raise exc.ArgumentError(
"Session event listen on a ScopedSession "
- "requries that its creation callable "
+ "requires that its creation callable "
"is a Session subclass.")
return target.session_factory
elif isinstance(target, type):
@@ -824,13 +824,13 @@ class SessionEvents(event.Events):
transaction is ongoing."""
def after_commit(self, session):
- """Execute after a commit has occured.
+ """Execute after a commit has occurred.
Note that this may not be per-flush if a longer running
transaction is ongoing."""
def after_rollback(self, session):
- """Execute after a rollback has occured.
+ """Execute after a rollback has occurred.
Note that this may not be per-flush if a longer running
transaction is ongoing."""
@@ -855,7 +855,7 @@ class SessionEvents(event.Events):
This will be when the 'new', 'dirty', and 'deleted' lists are in
their final state. An actual commit() may or may not have
- occured, depending on whether or not the flush started its own
+ occurred, depending on whether or not the flush started its own
transaction or participated in a larger transaction. """
def after_begin( self, session, transaction, connection):
diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py
index 39bc61290..907dd4bf5 100644
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -543,7 +543,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/mapper.py b/lib/sqlalchemy/orm/mapper.py
index fae47ac05..0cc28c8e8 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -199,7 +199,7 @@ class Mapper(object):
self.configured = False
# prevent this mapper from being constructed
- # while a configure_mappers() is occuring (and defer a configure_mappers()
+ # while a configure_mappers() is occurring (and defer a configure_mappers()
# until construction succeeds)
_COMPILE_MUTEX.acquire()
try:
@@ -1686,7 +1686,7 @@ class Mapper(object):
has_all_pks = False
elif col.default is None and \
col.server_default is None:
- params[col.key] = value
+ params[col.key] = value
elif isinstance(value, sql.ClauseElement):
value_params[col] = value
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 68e3196df..969905641 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -709,7 +709,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))
@@ -781,7 +781,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
@@ -1173,7 +1173,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 6f79d7c9c..534985084 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -272,7 +272,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:
@@ -444,7 +444,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.
@@ -457,7 +457,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.
@@ -856,12 +856,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`.
"""
@@ -1165,7 +1165,7 @@ class Query(object):
A two-element form of \*props may also be passed. In this form,
the first element is a target class or selectable, the second
is a string property name, class-mapped attribute, or clause
- construct representing an "ON" clause. This supercedes the
+ construct representing an "ON" clause. This supersedes the
previous "tuple" calling form - multiple join() calls should
be used for multiple (target, onclause) pairs.
@@ -1235,7 +1235,7 @@ class Query(object):
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.
@@ -2760,7 +2760,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 74e8a766f..eb148bc78 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -674,7 +674,7 @@ class Session(object):
:param close_with_result: Passed to :meth:`Engine.connect`, indicating
the :class:`.Connection` should be considered "single use", automatically
closing when the first result set is closed. This flag only has
- an effect if this :class:`.Session` is configued with ``autocommit=True``
+ an effect if this :class:`.Session` is configured with ``autocommit=True``
and does not already have a transaction in progress.
:param \**kw:
@@ -950,7 +950,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
@@ -1086,7 +1086,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 60a8bcb9a..15d35d2a5 100644
--- a/lib/sqlalchemy/orm/sync.py
+++ b/lib/sqlalchemy/orm/sync.py
@@ -31,7 +31,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/pool.py b/lib/sqlalchemy/pool.py
index 7201bccf3..327e4aa1f 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -117,7 +117,7 @@ class Pool(log.Identified):
:class:`~sqlalchemy.interfaces.PoolListener`-like objects or
dictionaries of callables that receive events when DB-API
connections are created, checked out and checked in to the
- pool. This has been superceded by
+ pool. This has been superseded by
:func:`~sqlalchemy.event.listen`.
"""
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index cd49ed167..afae611a6 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -865,7 +865,7 @@ def bindparam(key, value=None, type_=None, unique=False, required=False, callabl
will be called at statement execution time to determine the
ultimate value. Used for scenarios where the actual bind
value cannot be determined at the point at which the clause
- construct is created, but embeded bind values are still desirable.
+ construct is created, but embedded bind values are still desirable.
:param type\_:
A ``TypeEngine`` object that will be used to pre-process the
@@ -2331,7 +2331,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`.
"""
@@ -2671,7 +2671,7 @@ class Executable(_Generative):
Note that the ORM makes use of its own "compiled" caches for
some operations, including flush operations. The caching
- used by the ORM internally supercedes a cache dictionary
+ used by the ORM internally supersedes a cache dictionary
specified here.
See also:
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index 331f74b7c..853ec9c5f 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -340,7 +340,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/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index d25fa3070..69776b133 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -92,7 +92,7 @@ class TypeEngine(AbstractType):
are serialized into strings are examples of "mutable"
column structures.
- .. note:: This functionality is now superceded by the
+ .. note:: This functionality is now superseded by the
``sqlalchemy.ext.mutable`` extension described in
:ref:`mutable_toplevel`.
@@ -534,7 +534,7 @@ class TypeDecorator(TypeEngine):
are serialized into strings are examples of "mutable"
column structures.
- .. note:: This functionality is now superceded by the
+ .. note:: This functionality is now superseded by the
``sqlalchemy.ext.mutable`` extension described in
:ref:`mutable_toplevel`.
@@ -553,7 +553,7 @@ class MutableType(object):
a mutable Python object type. This functionality is used
only by the ORM.
- .. note:: :class:`.MutableType` is superceded as of SQLAlchemy 0.7
+ .. note:: :class:`.MutableType` is superseded as of SQLAlchemy 0.7
by the ``sqlalchemy.ext.mutable`` extension described in
:ref:`mutable_toplevel`. This extension provides an event
driven approach to in-place mutation detection that does not
@@ -1614,7 +1614,7 @@ class PickleType(MutableType, TypeDecorator):
behavior. (default changed from ``True`` in
0.7.0).
- .. note:: This functionality is now superceded by the
+ .. note:: This functionality is now superseded by the
``sqlalchemy.ext.mutable`` extension described in
:ref:`mutable_toplevel`.
diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index a805d9838..113f60c14 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 c4aec7e37..8e4aebff9 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -447,7 +447,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_attributes.py b/test/orm/test_attributes.py
index 7d3793abd..cc6017fa9 100644
--- a/test/orm/test_attributes.py
+++ b/test/orm/test_attributes.py
@@ -1333,7 +1333,7 @@ class HistoryTest(_base.ORMTest):
# setting None on uninitialized is currently not a change for an
# object attribute (this is different than scalar attribute). a
- # lazyload has occured so if its None, its really None
+ # lazyload has occurred so if its None, its really None
f = Foo()
eq_(attributes.get_state_history(attributes.instance_state(f),
diff --git a/test/orm/test_events.py b/test/orm/test_events.py
index 47c53628b..09bb22450 100644
--- a/test/orm/test_events.py
+++ b/test/orm/test_events.py
@@ -684,8 +684,8 @@ class SessionEventsTest(_RemoveListeners, _fixtures.FixtureTest):
class MapperExtensionTest(_fixtures.FixtureTest):
- """Superceded by MapperEventsTest - test backwards
- compatiblity of MapperExtension."""
+ """Superseded by MapperEventsTest - test backwards
+ compatibility of MapperExtension."""
run_inserts = None
diff --git a/test/orm/test_expire.py b/test/orm/test_expire.py
index 68b254725..78af5135f 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_joins.py b/test/orm/test_joins.py
index 8b41ad5de..6bb548485 100644
--- a/test/orm/test_joins.py
+++ b/test/orm/test_joins.py
@@ -359,7 +359,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
)
def test_multi_tuple_form(self):
- """test the 'tuple' form of join, now superceded by the two-element join() form.
+ """test the 'tuple' form of join, now superseded by the two-element join() form.
Not deprecating this style as of yet.
diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py
index 0625b59c9..748db61ec 100644
--- a/test/orm/test_unitofwork.py
+++ b/test/orm/test_unitofwork.py
@@ -1967,7 +1967,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)
@@ -1999,7 +1999,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)