From: Mike Bayer Date: Fri, 6 May 2022 20:25:19 +0000 (-0400) Subject: run zimports to match pref changes X-Git-Tag: rel_2_0_0b1~320 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47c91d06b56b0a0cf366d3c1f8b6d71a82149e43;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git 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 2d5707b536..77dc21d181 100644 --- 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 afae8a59a2..2816998117 100644 --- 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 9db6f3f527..a55d140253 100644 --- 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 aca0be6837..420ba5c8c3 100644 --- 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 0c990f8099..fbe35f92ab 100644 --- 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 9c79a4172b..b1f81cb6b8 100644 --- 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 4738d8c2c9..5975c30db3 100644 --- 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 934423e2f6..22be96fad1 100644 --- 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 ebc8a28cee..98d763e98d 100644 --- 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 3293ecac03..d7f5f8f9a8 100644 --- 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