From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 15 Oct 2024 00:21:40 +0000 (-0400)
Subject: update for mypy 1.12.0
X-Git-Tag: rel_2_0_36~6^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1bffa312ba973aaac639e04950457e81d291f9b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

update for mypy 1.12.0

Change-Id: I8ab16e439a27b3072402beb2c09f715047362c94
(cherry picked from commit d8dd28c42eaffca1cd964a4ab8378c592332e41e)
---

diff --git a/lib/sqlalchemy/ext/asyncio/session.py b/lib/sqlalchemy/ext/asyncio/session.py
index 473a8c1717..c2a47d7802 100644
--- a/lib/sqlalchemy/ext/asyncio/session.py
+++ b/lib/sqlalchemy/ext/asyncio/session.py
@@ -1863,7 +1863,7 @@ class AsyncSessionTransaction(
     ) -> AsyncSessionTransaction:
         self.sync_transaction = self._assign_proxied(
             await greenlet_spawn(
-                self.session.sync_session.begin_nested  # type: ignore
+                self.session.sync_session.begin_nested
                 if self.nested
                 else self.session.sync_session.begin
             )
diff --git a/lib/sqlalchemy/sql/coercions.py b/lib/sqlalchemy/sql/coercions.py
index 0c998c667f..1d11cbbd3d 100644
--- a/lib/sqlalchemy/sql/coercions.py
+++ b/lib/sqlalchemy/sql/coercions.py
@@ -29,7 +29,6 @@ from typing import TYPE_CHECKING
 from typing import TypeVar
 from typing import Union
 
-from . import operators
 from . import roles
 from . import visitors
 from ._typing import is_from_clause
@@ -843,18 +842,19 @@ class InElementImpl(RoleImpl):
             % (elem.__class__.__name__)
         )
 
-    def _literal_coercion(  # type: ignore[override]
-        self, element, *, expr, operator, **kw
-    ):
+    @util.preload_module("sqlalchemy.sql.elements")
+    def _literal_coercion(self, element, *, expr, operator, **kw):
         if util.is_non_string_iterable(element):
             non_literal_expressions: Dict[
-                Optional[operators.ColumnOperators],
-                operators.ColumnOperators,
+                Optional[ColumnElement[Any]],
+                ColumnElement[Any],
             ] = {}
             element = list(element)
             for o in element:
                 if not _is_literal(o):
-                    if not isinstance(o, operators.ColumnOperators):
+                    if not isinstance(
+                        o, util.preloaded.sql_elements.ColumnElement
+                    ):
                         self._raise_for_expected(element, **kw)
 
                     else: