Use typing module instead of typing_extension for 3.8 objects

Change-Id: Ia3117b24d677f5e36134df20eb151edef0f6ac36

diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index ea7ac156fe1b26cacb6d84e33a126a1938fc779a..a932d67923baea1048c2e66ba06790a84a618a08 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -1410,6 +1410,7 @@ from typing import List
 from typing import Optional
 from typing import Tuple
 from typing import TYPE_CHECKING
+from typing import TypedDict
 from typing import Union
 
 from . import array as _array
@@ -1487,7 +1488,6 @@ from ...types import SMALLINT
 from ...types import TEXT
 from ...types import UUID as UUID
 from ...types import VARCHAR
-from ...util.typing import TypedDict
 
 IDX_USING = re.compile(r"^(?:btree|hash|gist|gin|[\w_]+)$", re.I)
 

diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 553d8f0bea1fb3d2260e7afc8524e7d86752fb0d..33e05120e24e14f7cf9075b77ca82e645f51ed94 100644 (file)
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -26,6 +26,7 @@ from typing import Any
 from typing import Callable
 from typing import cast
 from typing import Dict
+from typing import Final
 from typing import List
 from typing import Mapping
 from typing import MutableMapping
@@ -64,7 +65,6 @@ from ..sql.compiler import DDLCompiler
 from ..sql.compiler import InsertmanyvaluesSentinelOpts
 from ..sql.compiler import SQLCompiler
 from ..sql.elements import quoted_name
-from ..util.typing import Final
 from ..util.typing import Literal
 
 if typing.TYPE_CHECKING:

diff --git a/lib/sqlalchemy/engine/interfaces.py b/lib/sqlalchemy/engine/interfaces.py
index 4bf0d3e9e7d85bab9a34e63c634007561ecab752..faea997deacba6d7bbdf46899081f9d6c641e685 100644 (file)
--- a/lib/sqlalchemy/engine/interfaces.py
+++ b/lib/sqlalchemy/engine/interfaces.py
@@ -23,11 +23,13 @@ from typing import List
 from typing import Mapping
 from typing import MutableMapping
 from typing import Optional
+from typing import Protocol
 from typing import Sequence
 from typing import Set
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
+from typing import TypedDict
 from typing import TypeVar
 from typing import Union
 
@@ -43,8 +45,6 @@ from ..util import immutabledict
 from ..util.concurrency import await_only
 from ..util.typing import Literal
 from ..util.typing import NotRequired
-from ..util.typing import Protocol
-from ..util.typing import TypedDict
 
 if TYPE_CHECKING:
     from .base import Connection

diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py
index 66e94429cb1d1315641d7622b9597cbe5208d3a1..6eed23cbfc600694e480a8437d566aa0439a8b3e 100644 (file)
--- a/lib/sqlalchemy/engine/reflection.py
+++ b/lib/sqlalchemy/engine/reflection.py
@@ -35,6 +35,7 @@ from typing import Any
 from typing import Callable
 from typing import Collection
 from typing import Dict
+from typing import final
 from typing import Generator
 from typing import Iterable
 from typing import List
@@ -59,7 +60,6 @@ from ..sql.elements import TextClause
 from ..sql.type_api import TypeEngine
 from ..sql.visitors import InternalTraversal
 from ..util import topological
-from ..util.typing import final
 
 if TYPE_CHECKING:
     from .interfaces import Dialect

diff --git a/lib/sqlalchemy/engine/util.py b/lib/sqlalchemy/engine/util.py
index 9b147a7014b97ac9a04827585e9974aec535e673..49f9f9b4eee39f6529a4016bdcfa636ddaba5a8a 100644 (file)
--- a/lib/sqlalchemy/engine/util.py
+++ b/lib/sqlalchemy/engine/util.py
@@ -11,12 +11,12 @@ import typing
 from typing import Any
 from typing import Callable
 from typing import Optional
+from typing import Protocol
 from typing import TypeVar
 
 from .. import exc
 from .. import util
 from ..util._has_cy import HAS_CYEXTENSION
-from ..util.typing import Protocol
 
 if typing.TYPE_CHECKING or not HAS_CYEXTENSION:
     from ._py_util import _distill_params_20 as _distill_params_20

diff --git a/lib/sqlalchemy/event/attr.py b/lib/sqlalchemy/event/attr.py
index 0aa341983059ff7485f500417d045904b4f6ee10..2a5fccba20209f37fe66456dc04e8cebc5cb8912 100644 (file)
--- a/lib/sqlalchemy/event/attr.py
+++ b/lib/sqlalchemy/event/attr.py
@@ -46,6 +46,7 @@ from typing import MutableMapping
 from typing import MutableSequence
 from typing import NoReturn
 from typing import Optional
+from typing import Protocol
 from typing import Sequence
 from typing import Set
 from typing import Tuple
@@ -62,7 +63,6 @@ from .registry import _ListenerFnType
 from .. import exc
 from .. import util
 from ..util.concurrency import AsyncAdaptedLock
-from ..util.typing import Protocol
 
 _T = TypeVar("_T", bound=Any)
 

diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py
index 3cca0ba7286c4d093b7bb04091fd05da2eee95b9..b0b0a5edf1dc518420623ce0c0cf5d1940e6474d 100644 (file)
--- a/lib/sqlalchemy/ext/associationproxy.py
+++ b/lib/sqlalchemy/ext/associationproxy.py
@@ -36,7 +36,9 @@ from typing import MutableSet
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Set
+from typing import SupportsIndex
 from typing import Tuple
 from typing import Type
 from typing import TypeVar
@@ -60,9 +62,7 @@ from ..sql import operators
 from ..sql import or_
 from ..sql.base import _NoArg
 from ..util.typing import Literal
-from ..util.typing import Protocol
 from ..util.typing import Self
-from ..util.typing import SupportsIndex
 from ..util.typing import SupportsKeysAndGetItem
 
 if typing.TYPE_CHECKING:

diff --git a/lib/sqlalchemy/ext/automap.py b/lib/sqlalchemy/ext/automap.py
index 18568c7f28fcc84afdb1d162233391288501f3a1..0ffc4dc50797e34d6356eab17f61b96c16a025ee 100644 (file)
--- a/lib/sqlalchemy/ext/automap.py
+++ b/lib/sqlalchemy/ext/automap.py
@@ -679,6 +679,7 @@ from typing import List
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Set
 from typing import Tuple
 from typing import Type
@@ -697,7 +698,6 @@ from ..orm.mapper import _CONFIGURE_MUTEX
 from ..schema import ForeignKeyConstraint
 from ..sql import and_
 from ..util import Properties
-from ..util.typing import Protocol
 
 if TYPE_CHECKING:
     from ..engine.base import Engine

diff --git a/lib/sqlalchemy/ext/horizontal_shard.py b/lib/sqlalchemy/ext/horizontal_shard.py
index 963bd005a4be3fcdbdbc006d7b221766dfbf4568..c50b1c522719a97711408231b8705f31aea2d00e 100644 (file)
--- a/lib/sqlalchemy/ext/horizontal_shard.py
+++ b/lib/sqlalchemy/ext/horizontal_shard.py
@@ -30,6 +30,7 @@ from typing import Callable
 from typing import Dict
 from typing import Iterable
 from typing import Optional
+from typing import Protocol
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
@@ -48,7 +49,6 @@ from ..orm.query import Query
 from ..orm.session import _BindArguments
 from ..orm.session import _PKIdentityArgument
 from ..orm.session import Session
-from ..util.typing import Protocol
 from ..util.typing import Self
 
 if TYPE_CHECKING:

diff --git a/lib/sqlalchemy/ext/hybrid.py b/lib/sqlalchemy/ext/hybrid.py
index 615f166b479a27657a562ae228ab78855671feea..6252e33d571e342160dae437e10b2f0474472a27 100644 (file)
--- a/lib/sqlalchemy/ext/hybrid.py
+++ b/lib/sqlalchemy/ext/hybrid.py
@@ -834,6 +834,7 @@ from typing import Generic
 from typing import List
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence
 from typing import Tuple
 from typing import Type
@@ -854,7 +855,6 @@ from ..sql.elements import SQLCoreOperations
 from ..util.typing import Concatenate
 from ..util.typing import Literal
 from ..util.typing import ParamSpec
-from ..util.typing import Protocol
 from ..util.typing import Self
 
 if TYPE_CHECKING:

diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py
index 38ea9469eea95c073b10e184a2378ef49dad8da9..312f0e49d67713462fd2b826d984922c2cb457ab 100644 (file)
--- a/lib/sqlalchemy/ext/mutable.py
+++ b/lib/sqlalchemy/ext/mutable.py
@@ -368,6 +368,7 @@ from typing import List
 from typing import Optional
 from typing import overload
 from typing import Set
+from typing import SupportsIndex
 from typing import Tuple
 from typing import TYPE_CHECKING
 from typing import TypeVar
@@ -394,7 +395,6 @@ from ..sql.base import SchemaEventTarget
 from ..sql.schema import Column
 from ..sql.type_api import TypeEngine
 from ..util import memoized_property
-from ..util.typing import SupportsIndex
 from ..util.typing import TypeGuard
 
 _KT = TypeVar("_KT")  # Key type.

diff --git a/lib/sqlalchemy/inspection.py b/lib/sqlalchemy/inspection.py
index 1fe37d925f2b6a55205b2567bff6bf0c8c35a433..b9671605f35693cb723549b9b48b3cbe20b6294b 100644 (file)
--- a/lib/sqlalchemy/inspection.py
+++ b/lib/sqlalchemy/inspection.py
@@ -36,13 +36,13 @@ from typing import Dict
 from typing import Generic
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Type
 from typing import TypeVar
 from typing import Union
 
 from . import exc
 from .util.typing import Literal
-from .util.typing import Protocol
 
 _T = TypeVar("_T", bound=Any)
 _TCov = TypeVar("_TCov", bound=Any, covariant=True)

diff --git a/lib/sqlalchemy/orm/_typing.py b/lib/sqlalchemy/orm/_typing.py
index 07f5e61a0ff37e130dd267026661503deafe86d1..532d0e0b361af8c2cb21ac5ae156e59320bd570d 100644 (file)
--- a/lib/sqlalchemy/orm/_typing.py
+++ b/lib/sqlalchemy/orm/_typing.py
@@ -12,6 +12,7 @@ from typing import Any
 from typing import Dict
 from typing import Mapping
 from typing import Optional
+from typing import Protocol
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
@@ -26,7 +27,6 @@ from ..sql._orm_types import (
 )
 from ..sql._typing import _HasClauseElement
 from ..sql.elements import ColumnElement
-from ..util.typing import Protocol
 from ..util.typing import TypeGuard
 
 if TYPE_CHECKING:

diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py
index 3a4964c4609250226a3addf368821821d50203bd..fa7f20ebc95c8390220a64e89019cf71fdc43018 100644 (file)
--- a/lib/sqlalchemy/orm/collections.py
+++ b/lib/sqlalchemy/orm/collections.py
@@ -117,6 +117,7 @@ from typing import Iterable
 from typing import List
 from typing import NoReturn
 from typing import Optional
+from typing import Protocol
 from typing import Set
 from typing import Tuple
 from typing import Type
@@ -130,7 +131,6 @@ from .. import exc as sa_exc
 from .. import util
 from ..sql.base import NO_ARG
 from ..util.compat import inspect_getfullargspec
-from ..util.typing import Protocol
 
 if typing.TYPE_CHECKING:
     from .attributes import AttributeEventToken

diff --git a/lib/sqlalchemy/orm/decl_api.py b/lib/sqlalchemy/orm/decl_api.py
index f2039afcd5405c60de7a1b574f71c4dde6e4388a..308c3a3479edbb7c056d1c3f5e519dae5a8b787c 100644 (file)
--- a/lib/sqlalchemy/orm/decl_api.py
+++ b/lib/sqlalchemy/orm/decl_api.py
@@ -662,7 +662,7 @@ class DeclarativeBase(
     collection as well as a specific value for
     :paramref:`_orm.registry.type_annotation_map`::
 
-        from typing_extensions import Annotated
+        from typing import Annotated
 
         from sqlalchemy import BigInteger
         from sqlalchemy import MetaData

diff --git a/lib/sqlalchemy/orm/decl_base.py b/lib/sqlalchemy/orm/decl_base.py
index 6e8578863eda53f982699beed6f4874a3c822212..3be539a2ebbc588884829c744ae40eeabe8a0946 100644 (file)
--- a/lib/sqlalchemy/orm/decl_base.py
+++ b/lib/sqlalchemy/orm/decl_base.py
@@ -22,10 +22,12 @@ from typing import Mapping
 from typing import NamedTuple
 from typing import NoReturn
 from typing import Optional
+from typing import Protocol
 from typing import Sequence
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
+from typing import TypedDict
 from typing import TypeVar
 from typing import Union
 import weakref
@@ -67,8 +69,6 @@ from ..util import topological
 from ..util.typing import _AnnotationScanType
 from ..util.typing import is_fwd_ref
 from ..util.typing import is_literal
-from ..util.typing import Protocol
-from ..util.typing import TypedDict
 from ..util.typing import typing_get_args
 
 if TYPE_CHECKING:

diff --git a/lib/sqlalchemy/orm/instrumentation.py b/lib/sqlalchemy/orm/instrumentation.py
index b12d80ac4f7d382397307d1e449301c05981ded1..6eb7773d0025f26a5c67830760b9658bef25ed2d 100644 (file)
--- a/lib/sqlalchemy/orm/instrumentation.py
+++ b/lib/sqlalchemy/orm/instrumentation.py
@@ -42,6 +42,7 @@ from typing import Generic
 from typing import Iterable
 from typing import List
 from typing import Optional
+from typing import Protocol
 from typing import Set
 from typing import Tuple
 from typing import Type
@@ -61,7 +62,6 @@ from .. import util
 from ..event import EventTarget
 from ..util import HasMemoized
 from ..util.typing import Literal
-from ..util.typing import Protocol
 
 if TYPE_CHECKING:
     from ._typing import _RegistryType

diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py
index fed07334fb588020b4a70fc212c2dc2b8afb71fb..cc3ad0d92390fd961d9225c8bcb7d8310d823977 100644 (file)
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -37,6 +37,7 @@ from typing import Set
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
+from typing import TypedDict
 from typing import TypeVar
 from typing import Union
 
@@ -71,7 +72,6 @@ from ..sql.schema import Column
 from ..sql.type_api import TypeEngine
 from ..util import warn_deprecated
 from ..util.typing import RODescriptorReference
-from ..util.typing import TypedDict
 
 if typing.TYPE_CHECKING:
     from ._typing import _EntityType

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index 15ece71dcd51292dcea64e6edcb2ba7c8479cde6..f5f08c72f5eb8e5d1a29a23d640cad6afdc5ed60 100644 (file)
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -15,6 +15,7 @@ from typing import Iterable
 from typing import Iterator
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence
 from typing import Tuple
 from typing import Type
@@ -31,7 +32,6 @@ from ..util import ScopedRegistry
 from ..util import ThreadLocalRegistry
 from ..util import warn
 from ..util import warn_deprecated
-from ..util.typing import Protocol
 
 if TYPE_CHECKING:
     from ._typing import _EntityType

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 4c3ab5ab62a5d52797c327e5fac32c9706bdb2ab..094e029ae77157c5743e50c3d672cfafb0659847 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -25,6 +25,7 @@ from typing import List
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence
 from typing import Set
 from typing import Tuple
@@ -90,7 +91,6 @@ from ..sql.selectable import ForUpdateArg
 from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL
 from ..util import IdentitySet
 from ..util.typing import Literal
-from ..util.typing import Protocol
 
 if typing.TYPE_CHECKING:
     from ._typing import _EntityType

diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index d9e1f854d77e8bba58ee4f962ebe9cda4c9aba63..20ecb2a6065724d268375747f80b467c3f6791cb 100644 (file)
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -20,6 +20,7 @@ from typing import Dict
 from typing import Generic
 from typing import Iterable
 from typing import Optional
+from typing import Protocol
 from typing import Set
 from typing import Tuple
 from typing import TYPE_CHECKING
@@ -45,7 +46,6 @@ from .. import exc as sa_exc
 from .. import inspection
 from .. import util
 from ..util.typing import Literal
-from ..util.typing import Protocol
 
 if TYPE_CHECKING:
     from ._typing import _IdentityKeyType

diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index c62851e1b3b23a04c1ea6116e8416f246a6264b1..e4bbef685ba474c5e314d84432d7932e55605b4f 100644 (file)
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -17,6 +17,7 @@ from typing import Any
 from typing import Callable
 from typing import cast
 from typing import Dict
+from typing import Final
 from typing import Iterable
 from typing import Optional
 from typing import overload
@@ -53,7 +54,6 @@ from ..sql import roles
 from ..sql import traversals
 from ..sql import visitors
 from ..sql.base import _generative
-from ..util.typing import Final
 from ..util.typing import Literal
 from ..util.typing import Self
 

diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index ea2f1a12e9365d562aace63b6c2a4e18476c5813..94bd63ba988eb37db2c66aa3f8e3fde54b17a5e2 100644 (file)
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -25,6 +25,7 @@ from typing import Iterator
 from typing import List
 from typing import Match
 from typing import Optional
+from typing import Protocol
 from typing import Sequence
 from typing import Tuple
 from typing import Type
@@ -91,7 +92,6 @@ from ..util.typing import (
 from ..util.typing import eval_name_only as _eval_name_only
 from ..util.typing import is_origin_of_cls
 from ..util.typing import Literal
-from ..util.typing import Protocol
 from ..util.typing import typing_get_origin
 
 if typing.TYPE_CHECKING:

diff --git a/lib/sqlalchemy/pool/base.py b/lib/sqlalchemy/pool/base.py
index 90ad1d4764c2c9df1424d4ac7b868edac1a8c546..303ed3f18128b56b9ca4e84e1934a2ef132b6624 100644 (file)
--- a/lib/sqlalchemy/pool/base.py
+++ b/lib/sqlalchemy/pool/base.py
@@ -25,6 +25,7 @@ from typing import Deque
 from typing import Dict
 from typing import List
 from typing import Optional
+from typing import Protocol
 from typing import Tuple
 from typing import TYPE_CHECKING
 from typing import Union
@@ -35,7 +36,6 @@ from .. import exc
 from .. import log
 from .. import util
 from ..util.typing import Literal
-from ..util.typing import Protocol
 
 if TYPE_CHECKING:
     from ..engine.interfaces import DBAPIConnection

diff --git a/lib/sqlalchemy/sql/_typing.py b/lib/sqlalchemy/sql/_typing.py
index 003cc51245a9a0f3af67303ccad4d82043166432..944b29176a177403ed7f9b131dce47fd1cc5cba4 100644 (file)
--- a/lib/sqlalchemy/sql/_typing.py
+++ b/lib/sqlalchemy/sql/_typing.py
@@ -16,6 +16,7 @@ from typing import Mapping
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Set
 from typing import Tuple
 from typing import Type
@@ -28,7 +29,6 @@ from .. import exc
 from .. import util
 from ..inspection import Inspectable
 from ..util.typing import Literal
-from ..util.typing import Protocol
 from ..util.typing import TypeAlias
 
 if TYPE_CHECKING:

diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py
index 104c5958a07583810ca3214ab438f9e5d2781a09..df79bc8471c263a7cf16cba073c3cb0baa33f68d 100644 (file)
--- a/lib/sqlalchemy/sql/base.py
+++ b/lib/sqlalchemy/sql/base.py
@@ -34,6 +34,7 @@ from typing import NamedTuple
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence
 from typing import Set
 from typing import Tuple
@@ -56,8 +57,6 @@ from .. import exc
 from .. import util
 from ..util import HasMemoized as HasMemoized
 from ..util import hybridmethod
-from ..util import typing as compat_typing
-from ..util.typing import Protocol
 from ..util.typing import Self
 from ..util.typing import TypeGuard
 
@@ -260,7 +259,7 @@ def _select_iterables(
 _SelfGenerativeType = TypeVar("_SelfGenerativeType", bound="_GenerativeType")
 
 
-class _GenerativeType(compat_typing.Protocol):
+class _GenerativeType(Protocol):
     def _generate(self) -> Self:
         ...
 

diff --git a/lib/sqlalchemy/sql/cache_key.py b/lib/sqlalchemy/sql/cache_key.py
index 831b90809b28b410a6310056e5ad3aaa1e5c07f2..094e8cac45448102d6113d80d1b17b93071466ff 100644 (file)
--- a/lib/sqlalchemy/sql/cache_key.py
+++ b/lib/sqlalchemy/sql/cache_key.py
@@ -19,6 +19,7 @@ from typing import List
 from typing import MutableMapping
 from typing import NamedTuple
 from typing import Optional
+from typing import Protocol
 from typing import Sequence
 from typing import Tuple
 from typing import Union
@@ -32,7 +33,6 @@ from .. import util
 from ..inspection import inspect
 from ..util import HasMemoized
 from ..util.typing import Literal
-from ..util.typing import Protocol
 
 if typing.TYPE_CHECKING:
     from .elements import BindParameter

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index cb6899c5e9a8761a321a54a232c39a61f293cc3b..d319db4bae6153a3fc187cfa1c0b60845ddea287 100644 (file)
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -49,11 +49,13 @@ from typing import NamedTuple
 from typing import NoReturn
 from typing import Optional
 from typing import Pattern
+from typing import Protocol
 from typing import Sequence
 from typing import Set
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
+from typing import TypedDict
 from typing import Union
 
 from . import base
@@ -86,8 +88,6 @@ from .. import exc
 from .. import util
 from ..util import FastIntFlag
 from ..util.typing import Literal
-from ..util.typing import Protocol
-from ..util.typing import TypedDict
 
 if typing.TYPE_CHECKING:
     from .annotation import _AnnotationDict

diff --git a/lib/sqlalchemy/sql/ddl.py b/lib/sqlalchemy/sql/ddl.py
index 06bbcae2e4b58e01cfbd2be8d6b7c9da408bd61b..2c2c20ceef8298da3846a381e023aad107ef0841 100644 (file)
--- a/lib/sqlalchemy/sql/ddl.py
+++ b/lib/sqlalchemy/sql/ddl.py
@@ -20,6 +20,7 @@ from typing import Callable
 from typing import Iterable
 from typing import List
 from typing import Optional
+from typing import Protocol
 from typing import Sequence as typing_Sequence
 from typing import Tuple
 
@@ -31,7 +32,6 @@ from .elements import ClauseElement
 from .. import exc
 from .. import util
 from ..util import topological
-from ..util.typing import Protocol
 from ..util.typing import Self
 
 if typing.TYPE_CHECKING:

diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index 1d3f2f483f69e4af2c2888fb4545ed3e2962fc96..b0acbb6e5a072a49d1289802cf2b131dfd0c29aa 100644 (file)
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -41,6 +41,7 @@ from typing import Dict
 from typing import Generic
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Set
 from typing import Tuple
 from typing import Type
@@ -51,7 +52,6 @@ from typing import Union
 from .. import exc
 from .. import util
 from ..util.typing import Literal
-from ..util.typing import Protocol
 
 if typing.TYPE_CHECKING:
     from ._typing import ColumnExpressionArgument

diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index 79239fc5cd49db247a5026bd02c4d131d8efef0f..5a9a64e69c585de16c0b214b5f1a96dcf5d7c631 100644 (file)
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -40,6 +40,7 @@ from typing import Callable
 from typing import cast
 from typing import Collection
 from typing import Dict
+from typing import Final
 from typing import Iterable
 from typing import Iterator
 from typing import List
@@ -47,10 +48,12 @@ from typing import Mapping
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence as _typing_Sequence
 from typing import Set
 from typing import Tuple
 from typing import TYPE_CHECKING
+from typing import TypedDict
 from typing import TypeVar
 from typing import Union
 
@@ -82,11 +85,8 @@ from .. import exc
 from .. import inspection
 from .. import util
 from ..util import HasMemoized
-from ..util.typing import Final
 from ..util.typing import Literal
-from ..util.typing import Protocol
 from ..util.typing import Self
-from ..util.typing import TypedDict
 from ..util.typing import TypeGuard
 
 if typing.TYPE_CHECKING:

diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index bbc7b0b549181aab2fdbed08e3f50e0e5e5f2fbf..439a3ba676399777f46354a2f84ed924b40b74f3 100644 (file)
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -30,6 +30,7 @@ from typing import NamedTuple
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence
 from typing import Set
 from typing import Tuple
@@ -98,7 +99,6 @@ from .. import exc
 from .. import util
 from ..util import HasMemoized_ro_memoized_attribute
 from ..util.typing import Literal
-from ..util.typing import Protocol
 from ..util.typing import Self
 
 and_ = BooleanClauseList.and_

diff --git a/lib/sqlalchemy/sql/type_api.py b/lib/sqlalchemy/sql/type_api.py
index 9226b01e61ac4eefa0a5012a132848f4fc8b9db4..5b26e05cab099d39cbe46b03b827a302dafc3893 100644 (file)
--- a/lib/sqlalchemy/sql/type_api.py
+++ b/lib/sqlalchemy/sql/type_api.py
@@ -23,10 +23,12 @@ from typing import Mapping
 from typing import NewType
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
+from typing import TypedDict
 from typing import TypeVar
 from typing import Union
 
@@ -37,9 +39,7 @@ from .operators import ColumnOperators
 from .visitors import Visitable
 from .. import exc
 from .. import util
-from ..util.typing import Protocol
 from ..util.typing import Self
-from ..util.typing import TypedDict
 from ..util.typing import TypeGuard
 
 # these are back-assigned by sqltypes.

diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index 19551831fe337d75fcf83c74244aa95ab55e5261..ed2ae8032650a7fc8fdc9d3dc27561ea5624fa25 100644 (file)
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -26,6 +26,7 @@ from typing import Iterator
 from typing import List
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence
 from typing import Tuple
 from typing import TYPE_CHECKING
@@ -69,7 +70,6 @@ from .visitors import _ET
 from .. import exc
 from .. import util
 from ..util.typing import Literal
-from ..util.typing import Protocol
 
 if typing.TYPE_CHECKING:
     from ._typing import _EquivalentColumnMap

diff --git a/lib/sqlalchemy/sql/visitors.py b/lib/sqlalchemy/sql/visitors.py
index cccebe65ba817a77eb8217d8bfe6941e12667b5c..3bf9205e476529193b44d9c32774f58c7be63418 100644 (file)
--- a/lib/sqlalchemy/sql/visitors.py
+++ b/lib/sqlalchemy/sql/visitors.py
@@ -28,6 +28,7 @@ from typing import List
 from typing import Mapping
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
@@ -39,7 +40,6 @@ from .. import util
 from ..util import langhelpers
 from ..util._has_cy import HAS_CYEXTENSION
 from ..util.typing import Literal
-from ..util.typing import Protocol
 from ..util.typing import Self
 
 if TYPE_CHECKING:

diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index e4677f73e15395fcaa2c94db2cf7c6d17d235dae..90cfa716e9e713fc5c4becfe0b87b2e52e6b9c9b 100644 (file)
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -27,6 +27,7 @@ from typing import Mapping
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence
 from typing import Set
 from typing import Tuple
@@ -37,7 +38,6 @@ import weakref
 
 from ._has_cy import HAS_CYEXTENSION
 from .typing import Literal
-from .typing import Protocol
 
 if typing.TYPE_CHECKING or not HAS_CYEXTENSION:
     from ._py_collections import immutabledict as immutabledict

diff --git a/lib/sqlalchemy/util/typing.py b/lib/sqlalchemy/util/typing.py
index aad5709451dce41d83262d6702d832f0ca9cbd88..d13859309afba00e5f89744cd07945061118fe6a 100644 (file)
--- a/lib/sqlalchemy/util/typing.py
+++ b/lib/sqlalchemy/util/typing.py
@@ -11,7 +11,6 @@ from __future__ import annotations
 import builtins
 import re
 import sys
-import typing
 from typing import Any
 from typing import Callable
 from typing import cast
@@ -24,6 +23,7 @@ from typing import NewType
 from typing import NoReturn
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Set
 from typing import Tuple
 from typing import Type
@@ -34,22 +34,19 @@ from typing import Union
 from . import compat
 
 if True:  # zimports removes the tailing comments
-    from typing_extensions import Annotated as Annotated  # 3.8
+    from typing_extensions import Annotated as Annotated  # 3.9
     from typing_extensions import Concatenate as Concatenate  # 3.10
     from typing_extensions import (
         dataclass_transform as dataclass_transform,  # 3.11,
     )
-    from typing_extensions import Final as Final  # 3.8
-    from typing_extensions import final as final  # 3.8
     from typing_extensions import get_args as get_args  # 3.10
     from typing_extensions import get_origin as get_origin  # 3.10
-    from typing_extensions import Literal as Literal  # 3.8
+    from typing_extensions import (
+        Literal as Literal,
+    )  # 3.8 but has bugs before 3.10
     from typing_extensions import NotRequired as NotRequired  # 3.11
     from typing_extensions import ParamSpec as ParamSpec  # 3.10
-    from typing_extensions import Protocol as Protocol  # 3.8
-    from typing_extensions import SupportsIndex as SupportsIndex  # 3.8
     from typing_extensions import TypeAlias as TypeAlias  # 3.10
-    from typing_extensions import TypedDict as TypedDict  # 3.8
     from typing_extensions import TypeGuard as TypeGuard  # 3.10
     from typing_extensions import Self as Self  # 3.11