summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLele Gaifax <lele@metapensiero.it>2021-01-24 13:59:03 -0500
committersqla-tester <sqla-tester@sqlalchemy.org>2021-01-24 13:59:03 -0500
commitf04147d9490df68b1fe1bb53991062d82017f865 (patch)
treeeebea42a0791544c9a10f1d7055a17497cf4108e
parent2df6eb140b4feb86d7cc99c0c976d1b22eb6e25b (diff)
downloadsqlalchemy-f04147d9490df68b1fe1bb53991062d82017f865.tar.gz
Fix many spell glitches in docstrings and comments
These were revealed by running `pylint --disable all --enable spelling --spelling-dict en_US` over all sources. Closes: #5868 Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/5868 Pull-request-sha: bb249195d92e3b806e81ecf1192d5a1b3cd5db48 Change-Id: I96080ec93a9fbd20ce21e9e16265b3c77f22bb14
-rw-r--r--lib/sqlalchemy/connectors/mxodbc.py2
-rw-r--r--lib/sqlalchemy/dialects/mssql/json.py2
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py4
-rw-r--r--lib/sqlalchemy/dialects/mysql/json.py2
-rw-r--r--lib/sqlalchemy/dialects/mysql/provision.py2
-rw-r--r--lib/sqlalchemy/dialects/mysql/reflection.py2
-rw-r--r--lib/sqlalchemy/dialects/oracle/base.py2
-rw-r--r--lib/sqlalchemy/dialects/oracle/cx_oracle.py4
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py8
-rw-r--r--lib/sqlalchemy/dialects/postgresql/ext.py2
-rw-r--r--lib/sqlalchemy/dialects/postgresql/json.py2
-rw-r--r--lib/sqlalchemy/dialects/postgresql/psycopg2.py4
-rw-r--r--lib/sqlalchemy/dialects/postgresql/ranges.py6
-rw-r--r--lib/sqlalchemy/dialects/sqlite/base.py6
-rw-r--r--lib/sqlalchemy/dialects/sqlite/json.py2
-rw-r--r--lib/sqlalchemy/dialects/sqlite/pysqlite.py2
-rw-r--r--lib/sqlalchemy/engine/interfaces.py2
-rw-r--r--lib/sqlalchemy/engine/result.py8
-rw-r--r--lib/sqlalchemy/ext/asyncio/result.py4
-rw-r--r--lib/sqlalchemy/ext/declarative/extensions.py2
-rw-r--r--lib/sqlalchemy/orm/decl_api.py4
-rw-r--r--lib/sqlalchemy/orm/loading.py2
-rw-r--r--lib/sqlalchemy/orm/mapper.py2
-rw-r--r--lib/sqlalchemy/orm/persistence.py2
-rw-r--r--lib/sqlalchemy/orm/query.py20
-rw-r--r--lib/sqlalchemy/orm/relationships.py2
-rw-r--r--lib/sqlalchemy/orm/session.py4
-rw-r--r--lib/sqlalchemy/sql/annotation.py2
-rw-r--r--lib/sqlalchemy/sql/base.py4
-rw-r--r--lib/sqlalchemy/sql/compiler.py4
-rw-r--r--lib/sqlalchemy/sql/crud.py4
-rw-r--r--lib/sqlalchemy/sql/elements.py4
-rw-r--r--lib/sqlalchemy/sql/lambdas.py2
-rw-r--r--lib/sqlalchemy/sql/operators.py2
-rw-r--r--lib/sqlalchemy/sql/selectable.py14
-rw-r--r--lib/sqlalchemy/sql/util.py4
-rw-r--r--lib/sqlalchemy/testing/requirements.py2
-rw-r--r--lib/sqlalchemy/util/_concurrency_py3k.py4
-rw-r--r--lib/sqlalchemy/util/compat.py2
-rw-r--r--lib/sqlalchemy/util/langhelpers.py4
-rw-r--r--lib/sqlalchemy/util/queue.py2
41 files changed, 79 insertions, 79 deletions
diff --git a/lib/sqlalchemy/connectors/mxodbc.py b/lib/sqlalchemy/connectors/mxodbc.py
index cd40863e4..153a836d2 100644
--- a/lib/sqlalchemy/connectors/mxodbc.py
+++ b/lib/sqlalchemy/connectors/mxodbc.py
@@ -108,7 +108,7 @@ class MxODBCConnector(Connector):
connect(dsn, user='', password='',
clear_auto_commit=1, errorhandler=None)
- This method translates the values in the provided uri
+ This method translates the values in the provided URI
into args and kwargs needed to instantiate an mxODBC Connection.
The arg 'errorhandler' is not used by SQLAlchemy and will
diff --git a/lib/sqlalchemy/dialects/mssql/json.py b/lib/sqlalchemy/dialects/mssql/json.py
index 2cae3f774..d5157312c 100644
--- a/lib/sqlalchemy/dialects/mssql/json.py
+++ b/lib/sqlalchemy/dialects/mssql/json.py
@@ -22,7 +22,7 @@ class JSON(sqltypes.JSON):
.. seealso::
- :class:`_types.JSON` - main documenation for the generic
+ :class:`_types.JSON` - main documentation for the generic
cross-platform JSON datatype.
The :class:`_mssql.JSON` type supports persistence of JSON values
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 63dbbd83e..c35031613 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -125,7 +125,7 @@ of ``1024``::
mysql_key_block_size="1024"
)
-When supporing :ref:`mysql_mariadb_only_mode` mode, similar keys against
+When supporting :ref:`mysql_mariadb_only_mode` mode, similar keys against
the "mariadb" prefix must be included as well. The values can of course
vary independently so that different settings on MySQL vs. MariaDB may
be maintained::
@@ -272,7 +272,7 @@ Server Side Cursors
-------------------
Server-side cursor support is available for the mysqlclient, PyMySQL,
-maridbconnector dialects and may also be available in others. This makes use
+mariadbconnector dialects and may also be available in others. This makes use
of either the "buffered=True/False" flag if available or by using a class such
as ``MySQLdb.cursors.SSCursor`` or ``pymysql.cursors.SSCursor`` internally.
diff --git a/lib/sqlalchemy/dialects/mysql/json.py b/lib/sqlalchemy/dialects/mysql/json.py
index 655e68cad..e66fb2986 100644
--- a/lib/sqlalchemy/dialects/mysql/json.py
+++ b/lib/sqlalchemy/dialects/mysql/json.py
@@ -21,7 +21,7 @@ class JSON(sqltypes.JSON):
.. seealso::
- :class:`_types.JSON` - main documenation for the generic
+ :class:`_types.JSON` - main documentation for the generic
cross-platform JSON datatype.
The :class:`.mysql.JSON` type supports persistence of JSON values
diff --git a/lib/sqlalchemy/dialects/mysql/provision.py b/lib/sqlalchemy/dialects/mysql/provision.py
index 50b6e3c85..86aaa94d9 100644
--- a/lib/sqlalchemy/dialects/mysql/provision.py
+++ b/lib/sqlalchemy/dialects/mysql/provision.py
@@ -12,7 +12,7 @@ def generate_driver_url(url, driver, query_str):
# NOTE: at the moment, tests are running mariadbconnector
# against both mariadb and mysql backends. if we want this to be
- # limited, do the decisionmaking here to reject a "mysql+mariadbconnector"
+ # limited, do the decision making here to reject a "mysql+mariadbconnector"
# URL. Optionally also re-enable the module level
# MySQLDialect_mariadbconnector.is_mysql flag as well, which must include
# a unit and/or functional test.
diff --git a/lib/sqlalchemy/dialects/mysql/reflection.py b/lib/sqlalchemy/dialects/mysql/reflection.py
index 2b8c9c528..b78034de2 100644
--- a/lib/sqlalchemy/dialects/mysql/reflection.py
+++ b/lib/sqlalchemy/dialects/mysql/reflection.py
@@ -451,7 +451,7 @@ class MySQLTableDefinitionParser(object):
# CONSTRAINT `CONSTRAINT_1` CHECK (`x` > 5)'
# testing on MariaDB 10.2 shows that the CHECK constraint
# is returned on a line by itself, so to match without worrying
- # about parenthesis in the expresion we go to the end of the line
+ # about parenthesis in the expression we go to the end of the line
self._re_ck_constraint = _re_compile(
r" "
r"CONSTRAINT +"
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 4754beebe..6c381a2ec 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -2010,7 +2010,7 @@ class OracleDialect(default.DefaultDialect):
def _parse_identity_options(self, identity_options, default_on_nul):
# identity_options is a string that starts with 'ALWAYS,' or
- # 'BY DEFAULT,' and contues with
+ # 'BY DEFAULT,' and continues with
# START WITH: 1, INCREMENT BY: 1, MAX_VALUE: 123, MIN_VALUE: 1,
# CYCLE_FLAG: N, CACHE_SIZE: 1, ORDER_FLAG: N, SCALE_FLAG: N,
# EXTEND_FLAG: N, SESSION_FLAG: N, KEEP_VALUE: N
diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
index b8b4df760..df00e071f 100644
--- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -53,7 +53,7 @@ and converted to the correct symbol::
:paramref:`_sa.create_engine.connect_args` parameter also accepts all
cx_Oracle DBAPI connect arguments.
-To pass arguments directly to ``.connect()`` wihtout using the query
+To pass arguments directly to ``.connect()`` without using the query
string, use the :paramref:`_sa.create_engine.connect_args` dictionary.
Any cx_Oracle parameter value and/or constant may be passed, such as::
@@ -334,7 +334,7 @@ disable this coercion to decimal for performance reasons, pass the flag
engine = create_engine("oracle+cx_oracle://dsn", coerce_to_decimal=False)
The ``coerce_to_decimal`` flag only impacts the results of plain string
-SQL staements that are not otherwise associated with a :class:`.Numeric`
+SQL statements that are not otherwise associated with a :class:`.Numeric`
SQLAlchemy type (or a subclass of such).
.. versionchanged:: 1.2 The numeric handling system for cx_Oracle has been
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index fd258bc5a..08d7cd9e5 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -234,7 +234,7 @@ that will be implicitly referred towards when a particular table or other
object is referenced in a SQL statement. As detailed in the next section
:ref:`postgresql_schema_reflection`, SQLAlchemy is generally organized around
the concept of keeping this variable at its default value of ``public``,
-however, in order to have it set to any arbirary name or names when connections
+however, in order to have it set to any arbitrary name or names when connections
are used automatically, the "SET SESSION search_path" command may be invoked
for all connections in a pool using the following event handler, as discussed
at :ref:`schema_set_default_connections`::
@@ -255,7 +255,7 @@ at :ref:`schema_set_default_connections`::
The reason the recipe is complicated by use of the ``.autocommit`` DBAPI
attribute is so that when the ``SET SESSION search_path`` directive is invoked,
-it is invoked outside of the scope of any tranasction and therefore will not
+it is invoked outside of the scope of any transaction and therefore will not
be reverted when the DBAPI connection has a rollback.
.. seealso::
@@ -1189,7 +1189,7 @@ Using JSON/JSONB with ARRAY
^^^^^^^^^^^^^^^^^^^^^^^^^^^
Similar to using ENUM, prior to SQLAlchemy 1.3.17, for an ARRAY of JSON/JSONB
-we need to render the appropriate CAST. Current psycopg2 drivers accomodate
+we need to render the appropriate CAST. Current psycopg2 drivers accommodate
the result set correctly without any special steps.
.. versionchanged:: 1.3.17 The combination of JSON/JSONB and ARRAY is now
@@ -2262,7 +2262,7 @@ class PGCompiler(compiler.SQLCompiler):
def fetch_clause(self, select, **kw):
# pg requires parens for non literal clauses. It's also required for
# bind parameters if a ::type casts is used by the driver (asyncpg),
- # so it's easies to just always add it
+ # so it's easiest to just always add it
text = ""
if select._offset_clause is not None:
text += "\n OFFSET (%s) ROWS" % self.process(
diff --git a/lib/sqlalchemy/dialects/postgresql/ext.py b/lib/sqlalchemy/dialects/postgresql/ext.py
index 908a0b675..1bd1e5258 100644
--- a/lib/sqlalchemy/dialects/postgresql/ext.py
+++ b/lib/sqlalchemy/dialects/postgresql/ext.py
@@ -87,7 +87,7 @@ class aggregate_order_by(expression.ColumnElement):
class ExcludeConstraint(ColumnCollectionConstraint):
"""A table-level EXCLUDE constraint.
- Defines an EXCLUDE constraint as described in the `postgres
+ Defines an EXCLUDE constraint as described in the `PostgreSQL
documentation`__.
__ http://www.postgresql.org/docs/9.0/static/sql-createtable.html#SQL-CREATETABLE-EXCLUDE
diff --git a/lib/sqlalchemy/dialects/postgresql/json.py b/lib/sqlalchemy/dialects/postgresql/json.py
index a5dfa40d6..1b165630c 100644
--- a/lib/sqlalchemy/dialects/postgresql/json.py
+++ b/lib/sqlalchemy/dialects/postgresql/json.py
@@ -107,7 +107,7 @@ class JSON(sqltypes.JSON):
.. seealso::
- :class:`_types.JSON` - main documenation for the generic
+ :class:`_types.JSON` - main documentation for the generic
cross-platform JSON datatype.
The operators provided by the PostgreSQL version of :class:`_types.JSON`
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index c8fc717ee..b1d27c6fa 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -74,8 +74,8 @@ using ``host`` as an additional keyword argument::
.. _psycopg2_multi_host:
-Specfiying multiple fallback hosts
-------------------------------------
+Specifiying multiple fallback hosts
+-----------------------------------
psycopg2 supports multiple connection points in the connection string.
When the ``host`` parameter is used multiple times in the query section of
diff --git a/lib/sqlalchemy/dialects/postgresql/ranges.py b/lib/sqlalchemy/dialects/postgresql/ranges.py
index 1f6f75f6d..ab44fa590 100644
--- a/lib/sqlalchemy/dialects/postgresql/ranges.py
+++ b/lib/sqlalchemy/dialects/postgresql/ranges.py
@@ -13,7 +13,7 @@ __all__ = ("INT4RANGE", "INT8RANGE", "NUMRANGE")
class RangeOperators(object):
"""
This mixin provides functionality for the Range Operators
- listed in Table 9-44 of the `postgres documentation`__ for Range
+ listed in Table 9-44 of the `PostgreSQL documentation`__ for Range
Functions and Operators. It is used by all the range types
provided in the ``postgres`` dialect and can likely be used for
any range types you create yourself.
@@ -21,7 +21,7 @@ class RangeOperators(object):
__ http://www.postgresql.org/docs/devel/static/functions-range.html
No extra support is provided for the Range Functions listed in
- Table 9-45 of the postgres documentation. For these, the normal
+ Table 9-45 of the PostgreSQL documentation. For these, the normal
:func:`~sqlalchemy.sql.expression.func` object should be used.
"""
@@ -94,7 +94,7 @@ class RangeOperators(object):
def __add__(self, other):
"""Range expression. Returns the union of the two ranges.
Will raise an exception if the resulting range is not
- contigous.
+ contiguous.
"""
return self.expr.op("+")(other)
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index a4c25e764..ded1ce2a8 100644
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -2132,7 +2132,7 @@ class SQLiteDialect(default.DefaultDialect):
return colspec
def _resolve_type_affinity(self, type_):
- """Return a data type from a reflected column, using affinity tules.
+ """Return a data type from a reflected column, using affinity rules.
SQLite's goal for universal compatibility introduces some complexity
during reflection, as a column's defined type might not actually be a
@@ -2143,7 +2143,7 @@ class SQLiteDialect(default.DefaultDialect):
listed in http://www.sqlite.org/datatype3.html section 2.1.
This method allows SQLAlchemy to support that algorithm, while still
- providing access to smarter reflection utilities by regcognizing
+ providing access to smarter reflection utilities by recognizing
column definitions that SQLite only supports through affinity (like
DATE and DOUBLE).
@@ -2224,7 +2224,7 @@ class SQLiteDialect(default.DefaultDialect):
referred_pk = self.get_pk_constraint(
connection, rtbl, schema=schema, **kw
)
- # note that if table doesnt exist, we still get back a record,
+ # note that if table doesn't exist, we still get back a record,
# just it has no columns in it
referred_columns = referred_pk["constrained_columns"]
else:
diff --git a/lib/sqlalchemy/dialects/sqlite/json.py b/lib/sqlalchemy/dialects/sqlite/json.py
index fadec3ce3..614f95405 100644
--- a/lib/sqlalchemy/dialects/sqlite/json.py
+++ b/lib/sqlalchemy/dialects/sqlite/json.py
@@ -14,7 +14,7 @@ class JSON(sqltypes.JSON):
.. seealso::
- :class:`_types.JSON` - main documenation for the generic
+ :class:`_types.JSON` - main documentation for the generic
cross-platform JSON datatype.
The :class:`_sqlite.JSON` type supports persistence of JSON values
diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlite.py b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
index 8636b7519..c940faf38 100644
--- a/lib/sqlalchemy/dialects/sqlite/pysqlite.py
+++ b/lib/sqlalchemy/dialects/sqlite/pysqlite.py
@@ -65,7 +65,7 @@ Modern versions of SQLite support an alternative system of connecting using a
that additional driver-level arguments can be passed including options such as
"read only". The Python sqlite3 driver supports this mode under modern Python
3 versions. The SQLAlchemy pysqlite driver supports this mode of use by
-specifing "uri=true" in the URL query string. The SQLite-level "URI" is kept
+specifying "uri=true" in the URL query string. The SQLite-level "URI" is kept
as the "database" portion of the SQLAlchemy url (that is, following a slash)::
e = create_engine("sqlite:///file:path/to/database?mode=ro&uri=true")
diff --git a/lib/sqlalchemy/engine/interfaces.py b/lib/sqlalchemy/engine/interfaces.py
index b5e23a4c2..4eb8a1d8d 100644
--- a/lib/sqlalchemy/engine/interfaces.py
+++ b/lib/sqlalchemy/engine/interfaces.py
@@ -1156,7 +1156,7 @@ class CreateEnginePlugin(object):
The :class:`_engine.URL` object is now immutable, so a
:class:`_engine.CreateEnginePlugin` that needs to alter the
- :class:`_engine.URL` object should impliement the
+ :class:`_engine.URL` object should implement the
:meth:`_engine.CreateEnginePlugin.update_url` method.
:param kwargs: The keyword arguments passed to
diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py
index cc3877e05..10dfaa904 100644
--- a/lib/sqlalchemy/engine/result.py
+++ b/lib/sqlalchemy/engine/result.py
@@ -1096,7 +1096,7 @@ class Result(_WithKeys, ResultInternal):
# type: () -> Any
"""Return exactly one scalar result or raise an exception.
- This is equvalent to calling :meth:`.Result.scalars` and then
+ This is equivalent to calling :meth:`.Result.scalars` and then
:meth:`.Result.one`.
.. seealso::
@@ -1112,7 +1112,7 @@ class Result(_WithKeys, ResultInternal):
# type: () -> Optional[Any]
"""Return exactly one or no scalar result.
- This is equvalent to calling :meth:`.Result.scalars` and then
+ This is equivalent to calling :meth:`.Result.scalars` and then
:meth:`.Result.one_or_none`.
.. seealso::
@@ -1528,7 +1528,7 @@ class FrozenResult(object):
:meth:`_engine.Result.freeze` method of any :class:`_engine.Result`
object.
- A new iterable :class:`.Result` object is generatged from a fixed
+ A new iterable :class:`.Result` object is generated from a fixed
set of data each time the :class:`.FrozenResult` is invoked as
a callable::
@@ -1709,7 +1709,7 @@ class MergedResult(IteratorResult):
self._unique_filter_state = results[0]._unique_filter_state
self._yield_per = results[0]._yield_per
- # going to try someting w/ this in next rev
+ # going to try something w/ this in next rev
self._source_supports_scalars = results[0]._source_supports_scalars
self._attributes = self._attributes.merge_with(
diff --git a/lib/sqlalchemy/ext/asyncio/result.py b/lib/sqlalchemy/ext/asyncio/result.py
index 9c7e0420f..915226b8c 100644
--- a/lib/sqlalchemy/ext/asyncio/result.py
+++ b/lib/sqlalchemy/ext/asyncio/result.py
@@ -225,7 +225,7 @@ class AsyncResult(AsyncCommon):
# type: () -> Any
"""Return exactly one scalar result or raise an exception.
- This is equvalent to calling :meth:`_asyncio.AsyncResult.scalars` and
+ This is equivalent to calling :meth:`_asyncio.AsyncResult.scalars` and
then :meth:`_asyncio.AsyncResult.one`.
.. seealso::
@@ -241,7 +241,7 @@ class AsyncResult(AsyncCommon):
# type: () -> Optional[Any]
"""Return exactly one or no scalar result.
- This is equvalent to calling :meth:`_asyncio.AsyncResult.scalars` and
+ This is equivalent to calling :meth:`_asyncio.AsyncResult.scalars` and
then :meth:`_asyncio.AsyncResult.one_or_none`.
.. seealso::
diff --git a/lib/sqlalchemy/ext/declarative/extensions.py b/lib/sqlalchemy/ext/declarative/extensions.py
index a2e295280..5c6356d8b 100644
--- a/lib/sqlalchemy/ext/declarative/extensions.py
+++ b/lib/sqlalchemy/ext/declarative/extensions.py
@@ -409,7 +409,7 @@ class DeferredReflection(object):
),
)
- # contoversy! do we resolve it here? or leave
+ # controversy! do we resolve it here? or leave
# it deferred? I think doing it here is necessary
# so the connection does not leak.
rel.secondary = rel.secondary()
diff --git a/lib/sqlalchemy/orm/decl_api.py b/lib/sqlalchemy/orm/decl_api.py
index 89d18bcac..e6983675b 100644
--- a/lib/sqlalchemy/orm/decl_api.py
+++ b/lib/sqlalchemy/orm/decl_api.py
@@ -291,7 +291,7 @@ def declarative_base(
Base = declarative_base()
- Is equvialent to::
+ Is equivalent to::
from sqlalchemy.orm import registry
@@ -612,7 +612,7 @@ class registry(object):
"""Map a class declaratively.
In this form of mapping, the class is scanned for mapping information,
- including for columns to be associaed with a table, and/or an
+ including for columns to be associated with a table, and/or an
actual table object.
Returns the :class:`_orm.Mapper` object.
diff --git a/lib/sqlalchemy/orm/loading.py b/lib/sqlalchemy/orm/loading.py
index 3a85a2d7f..32c627b00 100644
--- a/lib/sqlalchemy/orm/loading.py
+++ b/lib/sqlalchemy/orm/loading.py
@@ -1328,7 +1328,7 @@ def load_scalar_attributes(mapper, state, attribute_names, passive):
# in the case of inheritance, particularly concrete and abstract
# concrete inheritance, the class manager might have some keys
# of attributes on the superclass that we didn't actually map.
- # These could be mapped as "concrete, dont load" or could be completely
+ # These could be mapped as "concrete, don't load" or could be completely
# excluded from the mapping and we know nothing about them. Filter them
# here to prevent them from coming through.
if attribute_names:
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 9ac0c85c6..bdaf4c921 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -154,7 +154,7 @@ class Mapper(
legacy_is_orphan=False,
_compiled_cache_size=100,
):
- r"""Direct consructor for a new :class:`_orm.Mapper` object.
+ r"""Direct constructor for a new :class:`_orm.Mapper` object.
The :func:`_orm.mapper` function is normally invoked through the
use of the :class:`_orm.registry` object through either the
diff --git a/lib/sqlalchemy/orm/persistence.py b/lib/sqlalchemy/orm/persistence.py
index b57963eb3..9fffb6cac 100644
--- a/lib/sqlalchemy/orm/persistence.py
+++ b/lib/sqlalchemy/orm/persistence.py
@@ -1982,7 +1982,7 @@ class BulkUDCompileState(CompileState):
and eval_condition(state.obj())
and (
update_options._refresh_identity_token is None
- # TODO: coverage for the case where horiziontal sharding
+ # TODO: coverage for the case where horizontal sharding
# invokes an update() or delete() given an explicit identity
# token up front
or state.identity_token
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 5dd2a8a21..5b0a78664 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -96,7 +96,7 @@ class Query(
:meth:`_query.Query.with_session`
method.
- For a full walkthrough of :class:`_query.Query` usage, see the
+ For a full walk through of :class:`_query.Query` usage, see the
:ref:`ormtutorial_toplevel`.
"""
@@ -771,9 +771,9 @@ class Query(
rows (which are most).
As of SQLAlchemy 1.4, the :meth:`_orm.Query.yield_per` method is
- equvalent to using the ``yield_per`` execution option at the ORM level.
- See the section :ref:`orm_queryguide_yield_per` for further background
- on this option.
+ equivalent to using the ``yield_per`` execution option at the ORM
+ level. See the section :ref:`orm_queryguide_yield_per` for further
+ background on this option.
"""
self.load_options += {"_yield_per": count}
@@ -936,7 +936,7 @@ class Query(
"""Return a Query with a specific 'autoflush' setting.
As of SQLAlchemy 1.4, the :meth:`_orm.Query.autoflush` method
- is equvalent to using the ``autoflush`` execution option at the
+ is equivalent to using the ``autoflush`` execution option at the
ORM level. See the section :ref:`orm_queryguide_autoflush` for
further background on this option.
@@ -950,9 +950,9 @@ class Query(
as they are loaded, or reused from the current :class:`.Session`.
As of SQLAlchemy 1.4, the :meth:`_orm.Query.populate_existing` method
- is equvalent to using the ``populate_existing`` execution option at the
- ORM level. See the section :ref:`orm_queryguide_populate_existing` for
- further background on this option.
+ is equivalent to using the ``populate_existing`` execution option at
+ the ORM level. See the section :ref:`orm_queryguide_populate_existing`
+ for further background on this option.
"""
self.load_options += {"_populate_existing": True}
@@ -1135,7 +1135,7 @@ class Query(
**automatic aliasing** to the entities inside the subquery, when
they are referenced on the outside. Above, if we continue to
refer to the ``User`` entity without any additional aliasing applied
- to it, those references wil be in terms of the subquery::
+ to it, those references will be in terms of the subquery::
q = session.query(User).filter(User.name.like('e%')).\
limit(5).from_self().\
@@ -1301,7 +1301,7 @@ class Query(
# this enables clause adaptation for non-ORM
# expressions.
# legacy. see test/orm/test_froms.py for various
- # "oldstyle" tests that rely on this and the correspoinding
+ # "oldstyle" tests that rely on this and the corresponding
# "newtyle" that do not.
self._compile_options += {"_orm_only_from_obj_alias": False}
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index 550ff3833..41c3a5e53 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -3650,7 +3650,7 @@ class JoinCondition(object):
class _ColInAnnotations(object):
- """Seralizable object that tests for a name in c._annotations."""
+ """Serializable object that tests for a name in c._annotations."""
__slots__ = ("name",)
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 8a7a64f78..d78c83b08 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -413,7 +413,7 @@ class ORMExecuteState(util.MemoizedSlots):
Handlers will very likely not want to add any options to queries
when such an operation is occurring, as loader options are already
- capable of being propigated to relationship loaders and should
+ capable of being propagated to relationship loaders and should
be already present.
.. seealso::
@@ -978,7 +978,7 @@ class Session(_SessionClassMethods):
:param autocommit:
Defaults to ``False``. When ``True``, the
:class:`.Session` does not automatically begin transactions for
- individual statement exections, will acquire connections from the
+ individual statement executions, will acquire connections from the
engine on an as-needed basis, releasing to the connection pool
after each statement. Flushes will begin and commit (or possibly
rollback) their own transaction if no transaction is present.
diff --git a/lib/sqlalchemy/sql/annotation.py b/lib/sqlalchemy/sql/annotation.py
index b29c9cc66..23b5052a9 100644
--- a/lib/sqlalchemy/sql/annotation.py
+++ b/lib/sqlalchemy/sql/annotation.py
@@ -306,7 +306,7 @@ def _shallow_annotate(element, annotations):
"""Annotate the given ClauseElement and copy its internals so that
internal objects refer to the new annotated object.
- Basically used to apply a "dont traverse" annotation to a
+ Basically used to apply a "don't traverse" annotation to a
selectable, without digging throughout the whole
structure wasting time.
"""
diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py
index 220bbb115..fe9455fb9 100644
--- a/lib/sqlalchemy/sql/base.py
+++ b/lib/sqlalchemy/sql/base.py
@@ -543,7 +543,7 @@ class Generative(HasMemoized):
class InPlaceGenerative(HasMemoized):
"""Provide a method-chaining pattern in conjunction with the
- @_generative decorator taht mutates in place."""
+ @_generative decorator that mutates in place."""
def _generate(self):
skip = self._memoized_keys
@@ -653,7 +653,7 @@ class Options(util.with_metaclass(_MetaOptions)):
d = other._state_dict()
# only support a merge with another object of our class
- # and which does not have attrs that we dont. otherwise
+ # and which does not have attrs that we don't. otherwise
# we risk having state that might not be part of our cache
# key strategy
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index ef7db0bbe..aabc257eb 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -711,7 +711,7 @@ class SQLCompiler(Compiled):
expect that they are to be invoked in an "executemany" style,
which may impact how the statement will be expected to return the
values of defaults and autoincrement / sequences and similar.
- Depending on the backend and driver in use, support for retreiving
+ Depending on the backend and driver in use, support for retrieving
these values may be disabled which means SQL expressions may
be rendered inline, RETURNING may not be rendered, etc.
@@ -4684,7 +4684,7 @@ class IdentifierPreparer(object):
return self.quote(schema)
def quote(self, ident, force=None):
- """Conditionally quote an identfier.
+ """Conditionally quote an identifier.
The identifier is quoted if it is a reserved word, contains
quote-necessary characters, or is an instance of
diff --git a/lib/sqlalchemy/sql/crud.py b/lib/sqlalchemy/sql/crud.py
index f67e76181..8b4950aa3 100644
--- a/lib/sqlalchemy/sql/crud.py
+++ b/lib/sqlalchemy/sql/crud.py
@@ -400,7 +400,7 @@ def _scan_cols(
# if we have to invoke a server-side function, we need
# to pre-execute it. or if this is a straight
# autoincrement column and the dialect supports it
- # we can use curosr.lastrowid.
+ # we can use cursor.lastrowid.
_append_param_insert_pk_no_returning(
compiler, stmt, c, values, kw
@@ -607,7 +607,7 @@ def _append_param_insert_pk_no_returning(compiler, stmt, c, values, kw):
)
or
# column has no default on it, but dialect can run the
- # "autoincrement" mechanism explictly, e.g. PostrgreSQL
+ # "autoincrement" mechanism explicitly, e.g. PostgreSQL
# SERIAL we know the sequence name
(
c.default is None
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index 5ea3526ea..a9f21cd5f 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -2242,7 +2242,7 @@ class BooleanClauseList(ClauseList, ColumnElement):
lcc = 1
else:
against = operator
- # techincally this would be len(convert_clauses) + 1
+ # technically this would be len(convert_clauses) + 1
# however this only needs to indicate "greater than one"
lcc = 2
convert_clauses.append(clause)
@@ -2550,7 +2550,7 @@ class Tuple(ClauseList, ColumnElement):
)
def self_group(self, against=None):
- # Tuple is parenthsized by definition.
+ # Tuple is parenthesized by definition.
return self
diff --git a/lib/sqlalchemy/sql/lambdas.py b/lib/sqlalchemy/sql/lambdas.py
index 92c3ac9f7..2ffed2788 100644
--- a/lib/sqlalchemy/sql/lambdas.py
+++ b/lib/sqlalchemy/sql/lambdas.py
@@ -1001,7 +1001,7 @@ class AnalyzedFunction(object):
# additionally, each PyWrapper will log that it did in fact
# create a parameter, otherwise, it's some kind of Python
# object in the closure and we want to track that, to make
- # sure it doesn't change to somehting else, or if it does,
+ # sure it doesn't change to something else, or if it does,
# that we create a different tracked function with that
# variable.
self.expr = lambda_element._invoke_user_fn(tracker_instrumented_fn)
diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index a7dfa9b6d..60f03195c 100644
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -542,7 +542,7 @@ class ColumnOperators(Operators):
In this calling form, the expression renders an "empty set"
expression. These expressions are tailored to individual backends
- and are generaly trying to get an empty SELECT statement as a
+ and are generally trying to get an empty SELECT statement as a
subquery. Such as on SQLite, the expression is::
WHERE col IN (SELECT 1 FROM (SELECT 1) WHERE 1!=1)
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index 8e478583f..7deb7fd82 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -88,7 +88,7 @@ def subquery(alias, *args, **kwargs):
class ReturnsRows(roles.ReturnsRowsRole, ClauseElement):
- """The basemost class for Core constructs that have some concept of
+ """The base-most class for Core constructs that have some concept of
columns that can represent rows.
While the SELECT statement and TABLE are the primary things we think
@@ -825,7 +825,7 @@ class FromClause(roles.AnonymizedFromClauseRole, Selectable):
this is used to "ping" a derived selectable to add a new column
to its .c. collection when a Column has been added to one of the
- Table objects it ultimtely derives from.
+ Table objects it ultimately derives from.
If the given selectable hasn't populated its .c. collection yet,
it should at least pass on the message to the contained selectables,
@@ -4414,7 +4414,7 @@ class Select(
.. versionadded:: 1.4 - The :func:`_sql.select` function now accepts
column arguments positionally. The top-level :func:`_sql.select`
function will automatically use the 1.x or 2.x style API based on
- the incoming argumnents; using :func:`_future.select` from the
+ the incoming arguments; using :func:`_future.select` from the
``sqlalchemy.future`` module will enforce that only the 2.x style
constructor is used.
@@ -4587,7 +4587,7 @@ class Select(
stmt = select(user_table).join(address_table, user_table.c.id == address_table.c.user_id)
- The above statement generages SQL similar to::
+ The above statement generates SQL similar to::
SELECT user.id, user.name FROM user JOIN address ON user.id = address.user_id
@@ -4672,7 +4672,7 @@ class Select(
user_table, address_table, user_table.c.id == address_table.c.user_id
)
- The above statement generages SQL similar to::
+ The above statement generates SQL similar to::
SELECT user.id, user.name, address.id, address.email, address.user_id
FROM user JOIN address ON user.id = address.user_id
@@ -4966,7 +4966,7 @@ class Select(
.. versionchanged:: 1.4 the :meth:`_sql.Select.with_only_columns`
method accepts the list of column expressions positionally;
- passing the expressions as a list is deprecateed.
+ passing the expressions as a list is deprecated.
"""
@@ -5271,7 +5271,7 @@ class Select(
# when use_labels is on:
# in all cases == if we see the same label name, use _label_anon_label
- # for subsequent occurences of that label
+ # for subsequent occurrences of that label
#
# anon_for_dupe_key == if we see the same column object multiple
# times under a particular name, whether it's the _label name or the
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index df805c557..5f35de5f0 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -504,7 +504,7 @@ class _repr_row(_repr_base):
class _repr_params(_repr_base):
"""Provide a string view of bound parameters.
- Truncates display to a given numnber of 'multi' parameter sets,
+ Truncates display to a given number of 'multi' parameter sets,
as well as long values to a given number of characters.
"""
@@ -852,7 +852,7 @@ class ClauseAdapter(visitors.ReplacingExternalTraversal):
):
# we are a SELECT statement and not derived from an alias of a
# table (which nonetheless may be a table our SELECT derives
- # from), so return the alias to prevent futher traversal
+ # from), so return the alias to prevent further traversal
# or
# we are an alias of a table and we are not derived from an
# alias of a table (which nonetheless may be the same table
diff --git a/lib/sqlalchemy/testing/requirements.py b/lib/sqlalchemy/testing/requirements.py
index 3999c5793..e5dda7d3e 100644
--- a/lib/sqlalchemy/testing/requirements.py
+++ b/lib/sqlalchemy/testing/requirements.py
@@ -496,7 +496,7 @@ class SuiteRequirements(Requirements):
@property
def no_sequences(self):
- """the oppopsite of "sequences", DB does not support sequences at
+ """the opposite of "sequences", DB does not support sequences at
all."""
return exclusions.NotPredicate(self.sequences)
diff --git a/lib/sqlalchemy/util/_concurrency_py3k.py b/lib/sqlalchemy/util/_concurrency_py3k.py
index 8edd057ef..94f4705d8 100644
--- a/lib/sqlalchemy/util/_concurrency_py3k.py
+++ b/lib/sqlalchemy/util/_concurrency_py3k.py
@@ -35,7 +35,7 @@ class _AsyncIoGreenlet(greenlet.greenlet):
def await_only(awaitable: Coroutine) -> Any:
"""Awaits an async function in a sync method.
- The sync method must be insice a :func:`greenlet_spawn` context.
+ The sync method must be inside a :func:`greenlet_spawn` context.
:func:`await_` calls cannot be nested.
:param awaitable: The coroutine to call.
@@ -59,7 +59,7 @@ def await_only(awaitable: Coroutine) -> Any:
def await_fallback(awaitable: Coroutine) -> Any:
"""Awaits an async function in a sync method.
- The sync method must be insice a :func:`greenlet_spawn` context.
+ The sync method must be inside a :func:`greenlet_spawn` context.
:func:`await_` calls cannot be nested.
:param awaitable: The coroutine to call.
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 1eed2c3af..0cbfa1366 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -362,7 +362,7 @@ if py3k:
Instead of introducing all the object-creation overhead and having
to reinvent from scratch, just copy their compatibility routine.
- Utimately we would need to rewrite our "decorator" routine completely
+ Ultimately we would need to rewrite our "decorator" routine completely
which is not really worth it right now, until all Python 2.x support
is dropped.
diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index f6d44f708..457d2875d 100644
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -533,7 +533,7 @@ def format_argspec_plus(fn, grouped=True):
)
elif spec[1]:
- # im not sure what this is
+ # I'm not sure what this is
self_arg = "%s[0]" % spec[1]
apply_pos_proxied = apply_pos
@@ -1844,7 +1844,7 @@ def inject_param_text(doctext, inject_params):
indent = " " * len(m.group(1)) + " "
# but if the next line has text, use that line's
- # indentntation
+ # indentation
if doclines:
m2 = re.match(r"(\s+)\S", doclines[0])
if m2:
diff --git a/lib/sqlalchemy/util/queue.py b/lib/sqlalchemy/util/queue.py
index 30e388248..b1ff8f64e 100644
--- a/lib/sqlalchemy/util/queue.py
+++ b/lib/sqlalchemy/util/queue.py
@@ -224,7 +224,7 @@ class AsyncAdaptedQueue:
# Delay creation of the queue until it is first used, to avoid
# binding it to a possibly wrong event loop.
# By delaying the creation of the pool we accommodate the common
- # usage pattern of instanciating the engine at module level, where a
+ # usage pattern of instantiating the engine at module level, where a
# different event loop is in present compared to when the application
# is actually run.