run zimports to match pref changes

I've turned "remove unused imports" back on so this
affects some not-used imports in TYPE_CHECKING blocks

Change-Id: I8b64ff4ec63f4cee01c2bf41399b691e1c3fb04a

diff --git a/lib/sqlalchemy/engine/mock.py b/lib/sqlalchemy/engine/mock.py
index 2d5707b536e801952269bfce1ecf9273879ca853..77dc21d181b61707f04c512165c954d8ee7c0e41 100644 (file)
--- a/lib/sqlalchemy/engine/mock.py
+++ b/lib/sqlalchemy/engine/mock.py
@@ -21,14 +21,12 @@ from .. import util
 
 
 if typing.TYPE_CHECKING:
-    from .base import Connection
     from .base import Engine
     from .interfaces import _CoreAnyExecuteParams
     from .interfaces import _ExecuteOptionsParameter
     from .interfaces import Dialect
     from .url import URL
     from ..sql.base import Executable
-    from ..sql.ddl import ExecutableDDLElement
     from ..sql.ddl import SchemaDropper
     from ..sql.ddl import SchemaGenerator
     from ..sql.schema import HasSchemaAttr

diff --git a/lib/sqlalchemy/event/attr.py b/lib/sqlalchemy/event/attr.py
index afae8a59a292606aba3ff251e7ae526fc8a83e1d..281699811741e97ea50e17075c28fe2489bd9ece 100644 (file)
--- a/lib/sqlalchemy/event/attr.py
+++ b/lib/sqlalchemy/event/attr.py
@@ -70,7 +70,6 @@ if typing.TYPE_CHECKING:
     from .base import _Dispatch
     from .base import _DispatchCommon
     from .base import _HasEventsDispatch
-    from .base import _JoinedDispatcher
 
 
 class RefCollection(util.MemoizedSlots, Generic[_ET]):

diff --git a/lib/sqlalchemy/exc.py b/lib/sqlalchemy/exc.py
index 9db6f3f527d30a59cddb7f98c0b630de857b2fe2..a55d140253dbf920908cfdf0db9502b2066f1129 100644 (file)
--- a/lib/sqlalchemy/exc.py
+++ b/lib/sqlalchemy/exc.py
@@ -28,9 +28,6 @@ from .util import preloaded as _preloaded
 
 if typing.TYPE_CHECKING:
     from .engine.interfaces import _AnyExecuteParams
-    from .engine.interfaces import _CoreAnyExecuteParams
-    from .engine.interfaces import _CoreMultiExecuteParams
-    from .engine.interfaces import _DBAPIAnyExecuteParams
     from .engine.interfaces import Dialect
     from .sql.compiler import Compiled
     from .sql.compiler import TypeCompiler

diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py
index aca0be683743aca77d28751551519faf87bcb64e..420ba5c8c354d6c20f2b0325bd458368d0ccb578 100644 (file)
--- a/lib/sqlalchemy/ext/associationproxy.py
+++ b/lib/sqlalchemy/ext/associationproxy.py
@@ -61,7 +61,6 @@ from ..util.typing import SupportsIndex
 from ..util.typing import SupportsKeysAndGetItem
 
 if typing.TYPE_CHECKING:
-    from ..orm.attributes import InstrumentedAttribute
     from ..orm.interfaces import MapperProperty
     from ..orm.interfaces import PropComparator
     from ..orm.mapper import Mapper

diff --git a/lib/sqlalchemy/orm/decl_api.py b/lib/sqlalchemy/orm/decl_api.py
index 0c990f80998de4c86d396027b534f54c9dc65d90..fbe35f92ab4db375f1d03785c44afd9f1d696d73 100644 (file)
--- a/lib/sqlalchemy/orm/decl_api.py
+++ b/lib/sqlalchemy/orm/decl_api.py
@@ -49,8 +49,6 @@ from ..util import hybridmethod
 from ..util import hybridproperty
 from ..util import typing as compat_typing
 
-if typing.TYPE_CHECKING:
-    from .state import InstanceState
 
 _T = TypeVar("_T", bound=Any)
 

diff --git a/lib/sqlalchemy/orm/decl_base.py b/lib/sqlalchemy/orm/decl_base.py
index 9c79a4172b1ce0c6df161420d2541d3cb6ef3923..b1f81cb6b8e3781d60ed4e4f01e28c1ea68429d0 100644 (file)
--- a/lib/sqlalchemy/orm/decl_base.py
+++ b/lib/sqlalchemy/orm/decl_base.py
@@ -45,7 +45,6 @@ from ..sql.schema import Table
 from ..util import topological
 
 if TYPE_CHECKING:
-    from ._typing import _O
     from ._typing import _RegistryType
 
 

diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py
index 4738d8c2c9ea7ebdd998b48da55166da0e0184f5..5975c30db3f1f2828c9eb7c38d4f30fa89fe49e0 100644 (file)
--- a/lib/sqlalchemy/orm/descriptor_props.py
+++ b/lib/sqlalchemy/orm/descriptor_props.py
@@ -47,7 +47,6 @@ from ..util.typing import Protocol
 if typing.TYPE_CHECKING:
     from .attributes import InstrumentedAttribute
     from .properties import MappedColumn
-    from ..sql._typing import _ColumnExpressionArgument
     from ..sql._typing import _InfoType
     from ..sql.schema import Column
 

diff --git a/lib/sqlalchemy/pool/base.py b/lib/sqlalchemy/pool/base.py
index 934423e2f6233c62dde7e036e03357187adf6931..22be96fad10260b0dcc04a5dc57363ffe7d3190e 100644 (file)
--- a/lib/sqlalchemy/pool/base.py
+++ b/lib/sqlalchemy/pool/base.py
@@ -40,7 +40,6 @@ if TYPE_CHECKING:
     from ..engine.interfaces import DBAPIConnection
     from ..engine.interfaces import DBAPICursor
     from ..engine.interfaces import Dialect
-    from ..event import _Dispatch
     from ..event import _DispatchCommon
     from ..event import _ListenerFnType
     from ..event import dispatcher

diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index ebc8a28cee81aedc4f9b7f341c2fd723c995c5ea..98d763e98de672cf2a8da09bda07d63dff482a71 100644 (file)
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -51,8 +51,6 @@ from ..util.typing import Literal
 from ..util.typing import Protocol
 
 if typing.TYPE_CHECKING:
-    from .elements import BinaryExpression
-    from .elements import ColumnElement
     from .type_api import TypeEngine
 
 _T = TypeVar("_T", bound=Any)

diff --git a/lib/sqlalchemy/sql/type_api.py b/lib/sqlalchemy/sql/type_api.py
index 3293ecac03aa4e69dc26ee3d6b1d6059e1162de0..d7f5f8f9a8f79749ce4c75cb3f74f7ef091436e0 100644 (file)
--- a/lib/sqlalchemy/sql/type_api.py
+++ b/lib/sqlalchemy/sql/type_api.py
@@ -44,14 +44,12 @@ if typing.TYPE_CHECKING:
     from .elements import BindParameter
     from .elements import ColumnElement
     from .operators import OperatorType
-    from .schema import Column
     from .sqltypes import _resolve_value_to_type as _resolve_value_to_type
     from .sqltypes import BOOLEANTYPE as BOOLEANTYPE
     from .sqltypes import INDEXABLE as INDEXABLE
     from .sqltypes import INTEGERTYPE as INTEGERTYPE
     from .sqltypes import MATCHTYPE as MATCHTYPE
     from .sqltypes import NULLTYPE as NULLTYPE
-    from .sqltypes import NullType
     from .sqltypes import STRINGTYPE as STRINGTYPE
     from .sqltypes import TABLEVALUE as TABLEVALUE
     from ..engine.interfaces import Dialect