Merge "Fix various source comment/doc typos" into main

10 files changed, 12 insertions, 12 deletions

diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg.py b/lib/sqlalchemy/dialects/postgresql/psycopg.py
index 698f0824f..3ba535d6c 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg.py
@@ -43,7 +43,7 @@ The asyncio version of the dialect may also be specified explicitly using the
     asyncio_engine = create_async_engine("postgresql+psycopg_async://scott:tiger@localhost/test")
 
 The ``psycopg`` dialect has the same API features as that of ``psycopg2``,
-with the exeption of the "fast executemany" helpers.   The "fast executemany"
+with the exception of the "fast executemany" helpers.   The "fast executemany"
 helpers are expected to be generalized and ported to ``psycopg`` before the final
 release of SQLAlchemy 2.0, however.
 
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 6deb45524..40fc5d162 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -187,7 +187,7 @@ class Connection(ConnectionEventsTarget):
         keeping the effect of such an option localized to a "sub" connection.
 
         .. versionchanged:: 2.0  The :meth:`_engine.Connection.execution_options`
-           method, in constrast to other objects with this method, modifies
+           method, in contrast to other objects with this method, modifies
            the connection in-place without creating copy of it.
 
         As discussed elsewhere, the :meth:`_engine.Connection.execution_options`
diff --git a/lib/sqlalchemy/engine/cursor.py b/lib/sqlalchemy/engine/cursor.py
index 13ce0a9ff..abb3650d2 100644
--- a/lib/sqlalchemy/engine/cursor.py
+++ b/lib/sqlalchemy/engine/cursor.py
@@ -348,7 +348,7 @@ class CursorResultMetaData(ResultMetaData):
         as with textual non-ordered columns.
 
         The name-matched system of merging is the same as that used by
-        SQLAlchemy for all cases up through te 0.9 series.   Positional
+        SQLAlchemy for all cases up through the 0.9 series.   Positional
         matching for compiled SQL expressions was introduced in 1.0 as a
         major performance feature, and positional matching for textual
         :class:`_expression.TextualSelect` objects in 1.1.
diff --git a/lib/sqlalchemy/ext/mypy/util.py b/lib/sqlalchemy/ext/mypy/util.py
index 595c1d2a7..fa42074c3 100644
--- a/lib/sqlalchemy/ext/mypy/util.py
+++ b/lib/sqlalchemy/ext/mypy/util.py
@@ -245,7 +245,7 @@ def unbound_to_instance(
 
     # TODO: figure out a more robust way to check this.  The node is some
     # kind of _SpecialForm, there's a typing.Optional that's _SpecialForm,
-    # but I cant figure out how to get them to match up
+    # but I can't figure out how to get them to match up
     if typ.name == "Optional":
         # convert from "Optional?" to the more familiar
         # UnionType[..., NoneType()]
diff --git a/lib/sqlalchemy/orm/path_registry.py b/lib/sqlalchemy/orm/path_registry.py
index a574422c9..2e64696d9 100644
--- a/lib/sqlalchemy/orm/path_registry.py
+++ b/lib/sqlalchemy/orm/path_registry.py
@@ -313,8 +313,8 @@ class TokenRegistry(PathRegistry):
     def __getitem__(self, entity):
         try:
             return self.path[entity]
-        except TypeError as te:
-            raise IndexError(f"{entity}") from te
+        except TypeError as err:
+            raise IndexError(f"{entity}") from err
 
 
 class PropRegistry(PathRegistry):
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 6c7905559..ad31c2432 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -376,7 +376,7 @@ class Query(
         # it to provide a real expression object.
         #
         # from there, it starts to look much like Query itself won't be
-        # passed into the execute process and wont generate its own cache
+        # passed into the execute process and won't generate its own cache
         # key; this will all occur in terms of the ORM-enabled Select.
         if not self._compile_options._set_base_alias:
             # if we don't have legacy top level aliasing features in use
diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index 30dfab0f5..4df275c71 100644
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -807,7 +807,7 @@ class _AbstractLoad(Generative, LoaderOption):
                         # scenario which should only be occurring in a loader
                         # that is against a non-aliased lead element with
                         # single path.  otherwise the
-                        # "B" wont match into the B(B, B2).
+                        # "B" won't match into the B(B, B2).
                         #
                         # i>=2 prevents this check from proceeding for
                         # the first path element.
diff --git a/lib/sqlalchemy/pool/base.py b/lib/sqlalchemy/pool/base.py
index e49de3465..0512582f8 100644
--- a/lib/sqlalchemy/pool/base.py
+++ b/lib/sqlalchemy/pool/base.py
@@ -792,7 +792,7 @@ class PoolProxiedConnection:
     pool.
 
     :class:`.PoolProxiedConnection` is basically the public-facing interface
-    for the :class:`._ConnectionFairy` implemenatation object, users familiar
+    for the :class:`._ConnectionFairy` implementation object, users familiar
     with :class:`._ConnectionFairy` can consider this object to be
     equivalent.
 
diff --git a/lib/sqlalchemy/sql/type_api.py b/lib/sqlalchemy/sql/type_api.py
index 395dc3364..9dd702410 100644
--- a/lib/sqlalchemy/sql/type_api.py
+++ b/lib/sqlalchemy/sql/type_api.py
@@ -1784,7 +1784,7 @@ class TypeDecorator(ExternalType, SchemaEventTarget, TypeEngine):
             in a result row subsequent to statement execution time.
 
         Subclasses of :class:`_types.TypeDecorator` can override this method
-        to provide custom column expresion behavior for the type.  This
+        to provide custom column expression behavior for the type.  This
         implementation will **replace** that of the underlying implementation
         type.
 
diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index 4594b225a..1b277cdee 100644
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -1917,8 +1917,8 @@ def inject_param_text(doctext, inject_params):
             lines.extend([line, to_inject, "\n"])
             to_inject = None
         elif line.endswith("::"):
-            # TODO: this still wont cover if the code example itself has blank
-            # lines in it, need to detect those via indentation.
+            # TODO: this still won't cover if the code example itself has
+            # blank lines in it, need to detect those via indentation.
             lines.extend([line, doclines.popleft()])
             continue
         lines.append(line)