Ignore flake8 F401 on specific files

Uses the flake8 option per-file-ignores that was introduced in a recent
version of flake8 (3.7.+) to avoid having lots of "noqa" in import
only files

Change-Id: Ib4871d63bad7e578165615df139cbf6093479201

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 01ed82b2820e5b80e3b5ae4fbecf259a7a80bc53..c66c463ac685d90af0df8411e412942ad5347283 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
     -   id: black
 
 -   repo: https://github.com/sqlalchemyorg/zimports
-    rev: 0.2.2
+    rev: 0.3.0
     hooks:
     -   id: zimports
 

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 3337028358d4a4b4b5e7907f4fafd40021b3184c..07ffaeee9a0b96c7e93f0ea93edec6c8d78c2c0f 100644 (file)
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -5,129 +5,129 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from . import util as _util  # noqa
-from .engine import create_engine  # noqa
-from .engine import create_mock_engine  # noqa
-from .engine import engine_from_config  # noqa
-from .inspection import inspect  # noqa
-from .schema import BLANK_SCHEMA  # noqa
-from .schema import CheckConstraint  # noqa
-from .schema import Column  # noqa
-from .schema import ColumnDefault  # noqa
-from .schema import Computed  # noqa
-from .schema import Constraint  # noqa
-from .schema import DDL  # noqa
-from .schema import DefaultClause  # noqa
-from .schema import FetchedValue  # noqa
-from .schema import ForeignKey  # noqa
-from .schema import ForeignKeyConstraint  # noqa
-from .schema import Identity  # noqa
-from .schema import Index  # noqa
-from .schema import MetaData  # noqa
-from .schema import PrimaryKeyConstraint  # noqa
-from .schema import Sequence  # noqa
-from .schema import Table  # noqa
-from .schema import ThreadLocalMetaData  # noqa
-from .schema import UniqueConstraint  # noqa
-from .sql import alias  # noqa
-from .sql import all_  # noqa
-from .sql import and_  # noqa
-from .sql import any_  # noqa
-from .sql import asc  # noqa
-from .sql import between  # noqa
-from .sql import bindparam  # noqa
-from .sql import case  # noqa
-from .sql import cast  # noqa
-from .sql import collate  # noqa
-from .sql import column  # noqa
-from .sql import delete  # noqa
-from .sql import desc  # noqa
-from .sql import distinct  # noqa
-from .sql import except_  # noqa
-from .sql import except_all  # noqa
-from .sql import exists  # noqa
-from .sql import extract  # noqa
-from .sql import false  # noqa
-from .sql import func  # noqa
-from .sql import funcfilter  # noqa
-from .sql import insert  # noqa
-from .sql import intersect  # noqa
-from .sql import intersect_all  # noqa
-from .sql import join  # noqa
-from .sql import LABEL_STYLE_DEFAULT  # noqa
-from .sql import LABEL_STYLE_DISAMBIGUATE_ONLY  # noqa
-from .sql import LABEL_STYLE_NONE  # noqa
-from .sql import LABEL_STYLE_TABLENAME_PLUS_COL  # noqa
-from .sql import lambda_stmt  # noqa
-from .sql import lateral  # noqa
-from .sql import literal  # noqa
-from .sql import literal_column  # noqa
-from .sql import modifier  # noqa
-from .sql import not_  # noqa
-from .sql import null  # noqa
-from .sql import nulls_first  # noqa
-from .sql import nulls_last  # noqa
-from .sql import nullsfirst  # noqa
-from .sql import nullslast  # noqa
-from .sql import or_  # noqa
-from .sql import outerjoin  # noqa
-from .sql import outparam  # noqa
-from .sql import over  # noqa
-from .sql import select  # noqa
-from .sql import subquery  # noqa
-from .sql import table  # noqa
-from .sql import tablesample  # noqa
-from .sql import text  # noqa
-from .sql import true  # noqa
-from .sql import tuple_  # noqa
-from .sql import type_coerce  # noqa
-from .sql import union  # noqa
-from .sql import union_all  # noqa
-from .sql import update  # noqa
-from .sql import values  # noqa
-from .sql import within_group  # noqa
-from .types import ARRAY  # noqa
-from .types import BIGINT  # noqa
-from .types import BigInteger  # noqa
-from .types import BINARY  # noqa
-from .types import BLOB  # noqa
-from .types import BOOLEAN  # noqa
-from .types import Boolean  # noqa
-from .types import CHAR  # noqa
-from .types import CLOB  # noqa
-from .types import DATE  # noqa
-from .types import Date  # noqa
-from .types import DATETIME  # noqa
-from .types import DateTime  # noqa
-from .types import DECIMAL  # noqa
-from .types import Enum  # noqa
-from .types import FLOAT  # noqa
-from .types import Float  # noqa
-from .types import INT  # noqa
-from .types import INTEGER  # noqa
-from .types import Integer  # noqa
-from .types import Interval  # noqa
-from .types import JSON  # noqa
-from .types import LargeBinary  # noqa
-from .types import NCHAR  # noqa
-from .types import NUMERIC  # noqa
-from .types import Numeric  # noqa
-from .types import NVARCHAR  # noqa
-from .types import PickleType  # noqa
-from .types import REAL  # noqa
-from .types import SMALLINT  # noqa
-from .types import SmallInteger  # noqa
-from .types import String  # noqa
-from .types import TEXT  # noqa
-from .types import Text  # noqa
-from .types import TIME  # noqa
-from .types import Time  # noqa
-from .types import TIMESTAMP  # noqa
-from .types import TypeDecorator  # noqa
-from .types import Unicode  # noqa
-from .types import UnicodeText  # noqa
-from .types import VARBINARY  # noqa
-from .types import VARCHAR  # noqa
+from . import util as _util
+from .engine import create_engine
+from .engine import create_mock_engine
+from .engine import engine_from_config
+from .inspection import inspect
+from .schema import BLANK_SCHEMA
+from .schema import CheckConstraint
+from .schema import Column
+from .schema import ColumnDefault
+from .schema import Computed
+from .schema import Constraint
+from .schema import DDL
+from .schema import DefaultClause
+from .schema import FetchedValue
+from .schema import ForeignKey
+from .schema import ForeignKeyConstraint
+from .schema import Identity
+from .schema import Index
+from .schema import MetaData
+from .schema import PrimaryKeyConstraint
+from .schema import Sequence
+from .schema import Table
+from .schema import ThreadLocalMetaData
+from .schema import UniqueConstraint
+from .sql import alias
+from .sql import all_
+from .sql import and_
+from .sql import any_
+from .sql import asc
+from .sql import between
+from .sql import bindparam
+from .sql import case
+from .sql import cast
+from .sql import collate
+from .sql import column
+from .sql import delete
+from .sql import desc
+from .sql import distinct
+from .sql import except_
+from .sql import except_all
+from .sql import exists
+from .sql import extract
+from .sql import false
+from .sql import func
+from .sql import funcfilter
+from .sql import insert
+from .sql import intersect
+from .sql import intersect_all
+from .sql import join
+from .sql import LABEL_STYLE_DEFAULT
+from .sql import LABEL_STYLE_DISAMBIGUATE_ONLY
+from .sql import LABEL_STYLE_NONE
+from .sql import LABEL_STYLE_TABLENAME_PLUS_COL
+from .sql import lambda_stmt
+from .sql import lateral
+from .sql import literal
+from .sql import literal_column
+from .sql import modifier
+from .sql import not_
+from .sql import null
+from .sql import nulls_first
+from .sql import nulls_last
+from .sql import nullsfirst
+from .sql import nullslast
+from .sql import or_
+from .sql import outerjoin
+from .sql import outparam
+from .sql import over
+from .sql import select
+from .sql import subquery
+from .sql import table
+from .sql import tablesample
+from .sql import text
+from .sql import true
+from .sql import tuple_
+from .sql import type_coerce
+from .sql import union
+from .sql import union_all
+from .sql import update
+from .sql import values
+from .sql import within_group
+from .types import ARRAY
+from .types import BIGINT
+from .types import BigInteger
+from .types import BINARY
+from .types import BLOB
+from .types import BOOLEAN
+from .types import Boolean
+from .types import CHAR
+from .types import CLOB
+from .types import DATE
+from .types import Date
+from .types import DATETIME
+from .types import DateTime
+from .types import DECIMAL
+from .types import Enum
+from .types import FLOAT
+from .types import Float
+from .types import INT
+from .types import INTEGER
+from .types import Integer
+from .types import Interval
+from .types import JSON
+from .types import LargeBinary
+from .types import NCHAR
+from .types import NUMERIC
+from .types import Numeric
+from .types import NVARCHAR
+from .types import PickleType
+from .types import REAL
+from .types import SMALLINT
+from .types import SmallInteger
+from .types import String
+from .types import TEXT
+from .types import Text
+from .types import TIME
+from .types import Time
+from .types import TIMESTAMP
+from .types import TypeDecorator
+from .types import Unicode
+from .types import UnicodeText
+from .types import VARBINARY
+from .types import VARCHAR
 
 
 __version__ = "1.4.0"
@@ -136,7 +136,7 @@ __version__ = "1.4.0"
 def __go(lcls):
     global __all__
 
-    from . import events  # noqa
+    from . import events
     from . import util as _sa_util
 
     import inspect as _inspect

diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py
index 2b98261ef2e2fefc5a6a70922862d615f8a13cf6..e1a07e857479e01ef829d63b62b0d26936cf215f 100644 (file)
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -15,47 +15,47 @@ constructor ``create_engine()``.
 
 """
 
-from . import events  # noqa
-from . import util  # noqa
-from .base import Connection  # noqa
-from .base import Engine  # noqa
-from .base import NestedTransaction  # noqa
-from .base import RootTransaction  # noqa
-from .base import Transaction  # noqa
-from .base import TwoPhaseTransaction  # noqa
+from . import events
+from . import util
+from .base import Connection
+from .base import Engine
+from .base import NestedTransaction
+from .base import RootTransaction
+from .base import Transaction
+from .base import TwoPhaseTransaction
 from .create import create_engine
 from .create import engine_from_config
-from .cursor import BaseCursorResult  # noqa
-from .cursor import BufferedColumnResultProxy  # noqa
-from .cursor import BufferedColumnRow  # noqa
-from .cursor import BufferedRowResultProxy  # noqa
-from .cursor import CursorResult  # noqa
-from .cursor import FullyBufferedResultProxy  # noqa
-from .cursor import LegacyCursorResult  # noqa
-from .interfaces import Compiled  # noqa
-from .interfaces import Connectable  # noqa
-from .interfaces import CreateEnginePlugin  # noqa
-from .interfaces import Dialect  # noqa
-from .interfaces import ExceptionContext  # noqa
-from .interfaces import ExecutionContext  # noqa
-from .interfaces import TypeCompiler  # noqa
+from .cursor import BaseCursorResult
+from .cursor import BufferedColumnResultProxy
+from .cursor import BufferedColumnRow
+from .cursor import BufferedRowResultProxy
+from .cursor import CursorResult
+from .cursor import FullyBufferedResultProxy
+from .cursor import LegacyCursorResult
+from .interfaces import Compiled
+from .interfaces import Connectable
+from .interfaces import CreateEnginePlugin
+from .interfaces import Dialect
+from .interfaces import ExceptionContext
+from .interfaces import ExecutionContext
+from .interfaces import TypeCompiler
 from .mock import create_mock_engine
-from .result import ChunkedIteratorResult  # noqa
-from .result import FrozenResult  # noqa
-from .result import IteratorResult  # noqa
-from .result import MappingResult  # noqa
-from .result import MergedResult  # noqa
-from .result import Result  # noqa
-from .result import result_tuple  # noqa
-from .result import ScalarResult  # noqa
-from .row import BaseRow  # noqa
-from .row import LegacyRow  # noqa
-from .row import Row  # noqa
-from .row import RowMapping  # noqa
-from .url import make_url  # noqa
-from .url import URL  # noqa
-from .util import connection_memoize  # noqa
-from ..sql import ddl  # noqa
+from .result import ChunkedIteratorResult
+from .result import FrozenResult
+from .result import IteratorResult
+from .result import MappingResult
+from .result import MergedResult
+from .result import Result
+from .result import result_tuple
+from .result import ScalarResult
+from .row import BaseRow
+from .row import LegacyRow
+from .row import Row
+from .row import RowMapping
+from .url import make_url
+from .url import URL
+from .util import connection_memoize
+from ..sql import ddl
 
 
 __all__ = ("create_engine", "engine_from_config", "create_mock_engine")

diff --git a/lib/sqlalchemy/event/__init__.py b/lib/sqlalchemy/event/__init__.py
index 093f596cb99440ad2ce5830e3a05beabe24d653a..76738519f3537b3f8ce06850f96818a457f98373 100644 (file)
--- a/lib/sqlalchemy/event/__init__.py
+++ b/lib/sqlalchemy/event/__init__.py
@@ -5,13 +5,13 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from .api import CANCEL  # noqa
-from .api import contains  # noqa
-from .api import listen  # noqa
-from .api import listens_for  # noqa
-from .api import NO_RETVAL  # noqa
-from .api import remove  # noqa
-from .attr import RefCollection  # noqa
-from .base import dispatcher  # noqa
-from .base import Events  # noqa
-from .legacy import _legacy_signature  # noqa
+from .api import CANCEL
+from .api import contains
+from .api import listen
+from .api import listens_for
+from .api import NO_RETVAL
+from .api import remove
+from .attr import RefCollection
+from .base import dispatcher
+from .base import Events
+from .legacy import _legacy_signature

diff --git a/lib/sqlalchemy/events.py b/lib/sqlalchemy/events.py
index 2d7f4fcbdccdf365c9217881c2aecab4a807c71d..3087c1b0ff1b4ca458c0bb7b441517250d119890 100644 (file)
--- a/lib/sqlalchemy/events.py
+++ b/lib/sqlalchemy/events.py
@@ -7,8 +7,8 @@
 
 """Core event interfaces."""
 
-from .engine.events import ConnectionEvents  # noqa
-from .engine.events import DialectEvents  # noqa
-from .pool.events import PoolEvents  # noqa
-from .sql.base import SchemaEventTarget  # noqa
-from .sql.events import DDLEvents  # noqa
+from .engine.events import ConnectionEvents
+from .engine.events import DialectEvents
+from .pool.events import PoolEvents
+from .sql.base import SchemaEventTarget
+from .sql.events import DDLEvents

diff --git a/lib/sqlalchemy/ext/asyncio/__init__.py b/lib/sqlalchemy/ext/asyncio/__init__.py
index b40dd6ac60e9006f5c2b0484a27caac03f7c1128..2fda2d777eb44b49eb5e0f018c60d71fe70b772b 100644 (file)
--- a/lib/sqlalchemy/ext/asyncio/__init__.py
+++ b/lib/sqlalchemy/ext/asyncio/__init__.py
@@ -5,14 +5,14 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from .engine import AsyncConnection  # noqa
-from .engine import AsyncEngine  # noqa
-from .engine import AsyncTransaction  # noqa
-from .engine import create_async_engine  # noqa
-from .events import AsyncConnectionEvents  # noqa
-from .events import AsyncSessionEvents  # noqa
-from .result import AsyncMappingResult  # noqa
-from .result import AsyncResult  # noqa
-from .result import AsyncScalarResult  # noqa
-from .session import AsyncSession  # noqa
-from .session import AsyncSessionTransaction  # noqa
+from .engine import AsyncConnection
+from .engine import AsyncEngine
+from .engine import AsyncTransaction
+from .engine import create_async_engine
+from .events import AsyncConnectionEvents
+from .events import AsyncSessionEvents
+from .result import AsyncMappingResult
+from .result import AsyncResult
+from .result import AsyncScalarResult
+from .session import AsyncSession
+from .session import AsyncSessionTransaction

diff --git a/lib/sqlalchemy/future/__init__.py b/lib/sqlalchemy/future/__init__.py
index 4e4054e846cd0e718e6f4c8c79f94902dc6241f4..976c2013696f9db4c62f7a4b9389579f5faaae1e 100644 (file)
--- a/lib/sqlalchemy/future/__init__.py
+++ b/lib/sqlalchemy/future/__init__.py
@@ -8,10 +8,10 @@
 """Future 2.0 API features.
 
 """
-from .engine import Connection  # noqa
-from .engine import create_engine  # noqa
-from .engine import Engine  # noqa
-from ..sql.selectable import Select  # noqa
+from .engine import Connection
+from .engine import create_engine
+from .engine import Engine
+from ..sql.selectable import Select
 from ..util.langhelpers import public_factory
 
 

diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index ac06efba6b4931c957b299095480bb1dec118805..daab8a2e3604760a913f7190c9597b0bf584c8eb 100644 (file)
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -13,73 +13,73 @@ documentation for an overview of how this module is used.
 
 """
 
-from . import exc  # noqa
-from . import mapper as mapperlib  # noqa
+from . import exc
+from . import mapper as mapperlib
 from . import strategy_options
-from .attributes import AttributeEvent  # noqa
-from .attributes import InstrumentedAttribute  # noqa
-from .attributes import QueryableAttribute  # noqa
-from .context import QueryContext  # noqa
-from .decl_api import as_declarative  # noqa
-from .decl_api import declarative_base  # noqa
-from .decl_api import DeclarativeMeta  # noqa
-from .decl_api import declared_attr  # noqa
-from .decl_api import has_inherited_table  # noqa
-from .decl_api import registry  # noqa
-from .decl_api import synonym_for  # noqa
-from .descriptor_props import CompositeProperty  # noqa
-from .descriptor_props import SynonymProperty  # noqa
-from .identity import IdentityMap  # noqa
-from .instrumentation import ClassManager  # noqa
-from .interfaces import EXT_CONTINUE  # noqa
-from .interfaces import EXT_SKIP  # noqa
-from .interfaces import EXT_STOP  # noqa
-from .interfaces import InspectionAttr  # noqa
-from .interfaces import InspectionAttrInfo  # noqa
-from .interfaces import MANYTOMANY  # noqa
-from .interfaces import MANYTOONE  # noqa
-from .interfaces import MapperProperty  # noqa
-from .interfaces import NOT_EXTENSION  # noqa
-from .interfaces import ONETOMANY  # noqa
-from .interfaces import PropComparator  # noqa
-from .loading import merge_frozen_result  # noqa
-from .loading import merge_result  # noqa
-from .mapper import class_mapper  # noqa
-from .mapper import configure_mappers  # noqa
-from .mapper import Mapper  # noqa
-from .mapper import reconstructor  # noqa
-from .mapper import validates  # noqa
-from .properties import ColumnProperty  # noqa
-from .query import AliasOption  # noqa
-from .query import FromStatement  # noqa
-from .query import Query  # noqa
-from .relationships import foreign  # noqa
-from .relationships import RelationshipProperty  # noqa
-from .relationships import remote  # noqa
-from .scoping import scoped_session  # noqa
-from .session import close_all_sessions  # noqa
-from .session import make_transient  # noqa
-from .session import make_transient_to_detached  # noqa
-from .session import object_session  # noqa
-from .session import ORMExecuteState  # noqa
-from .session import Session  # noqa
-from .session import sessionmaker  # noqa
-from .session import SessionTransaction  # noqa
-from .state import AttributeState  # noqa
-from .state import InstanceState  # noqa
-from .strategy_options import Load  # noqa
-from .unitofwork import UOWTransaction  # noqa
-from .util import aliased  # noqa
-from .util import Bundle  # noqa
-from .util import CascadeOptions  # noqa
-from .util import join  # noqa
-from .util import LoaderCriteriaOption  # noqa
-from .util import object_mapper  # noqa
-from .util import outerjoin  # noqa
-from .util import polymorphic_union  # noqa
-from .util import was_deleted  # noqa
-from .util import with_parent  # noqa
-from .util import with_polymorphic  # noqa
+from .attributes import AttributeEvent
+from .attributes import InstrumentedAttribute
+from .attributes import QueryableAttribute
+from .context import QueryContext
+from .decl_api import as_declarative
+from .decl_api import declarative_base
+from .decl_api import DeclarativeMeta
+from .decl_api import declared_attr
+from .decl_api import has_inherited_table
+from .decl_api import registry
+from .decl_api import synonym_for
+from .descriptor_props import CompositeProperty
+from .descriptor_props import SynonymProperty
+from .identity import IdentityMap
+from .instrumentation import ClassManager
+from .interfaces import EXT_CONTINUE
+from .interfaces import EXT_SKIP
+from .interfaces import EXT_STOP
+from .interfaces import InspectionAttr
+from .interfaces import InspectionAttrInfo
+from .interfaces import MANYTOMANY
+from .interfaces import MANYTOONE
+from .interfaces import MapperProperty
+from .interfaces import NOT_EXTENSION
+from .interfaces import ONETOMANY
+from .interfaces import PropComparator
+from .loading import merge_frozen_result
+from .loading import merge_result
+from .mapper import class_mapper
+from .mapper import configure_mappers
+from .mapper import Mapper
+from .mapper import reconstructor
+from .mapper import validates
+from .properties import ColumnProperty
+from .query import AliasOption
+from .query import FromStatement
+from .query import Query
+from .relationships import foreign
+from .relationships import RelationshipProperty
+from .relationships import remote
+from .scoping import scoped_session
+from .session import close_all_sessions
+from .session import make_transient
+from .session import make_transient_to_detached
+from .session import object_session
+from .session import ORMExecuteState
+from .session import Session
+from .session import sessionmaker
+from .session import SessionTransaction
+from .state import AttributeState
+from .state import InstanceState
+from .strategy_options import Load
+from .unitofwork import UOWTransaction
+from .util import aliased
+from .util import Bundle
+from .util import CascadeOptions
+from .util import join
+from .util import LoaderCriteriaOption
+from .util import object_mapper
+from .util import outerjoin
+from .util import polymorphic_union
+from .util import was_deleted
+from .util import with_parent
+from .util import with_polymorphic
 from .. import sql as _sql
 from .. import util as _sa_util
 from ..util.langhelpers import public_factory
@@ -298,21 +298,21 @@ def eagerload(*args, **kwargs):
 contains_alias = public_factory(AliasOption, ".orm.contains_alias")
 
 if True:
-    from .events import AttributeEvents  # noqa
-    from .events import MapperEvents  # noqa
-    from .events import InstanceEvents  # noqa
-    from .events import InstrumentationEvents  # noqa
-    from .events import QueryEvents  # noqa
-    from .events import SessionEvents  # noqa
+    from .events import AttributeEvents
+    from .events import MapperEvents
+    from .events import InstanceEvents
+    from .events import InstrumentationEvents
+    from .events import QueryEvents
+    from .events import SessionEvents
 
 
 def __go(lcls):
     global __all__
     global AppenderQuery
-    from .. import util as sa_util  # noqa
-    from . import dynamic  # noqa
-    from . import events  # noqa
-    from . import loading  # noqa
+    from .. import util as sa_util
+    from . import dynamic
+    from . import events
+    from . import loading
     import inspect as _inspect
 
     from .dynamic import AppenderQuery

diff --git a/lib/sqlalchemy/pool/__init__.py b/lib/sqlalchemy/pool/__init__.py
index 29f589acc85938d8eaed170dbe4a75f6f1415869..125c5d894a2edbeb1e28972c3b90771f37975efc 100644 (file)
--- a/lib/sqlalchemy/pool/__init__.py
+++ b/lib/sqlalchemy/pool/__init__.py
@@ -17,10 +17,10 @@ regular DB-API connect() methods to be transparently managed by a
 SQLAlchemy connection pool.
 """
 
-from . import events  # noqa
-from .base import _ConnectionFairy  # noqa
-from .base import _ConnectionRecord  # noqa
-from .base import _finalize_fairy  # noqa
+from . import events
+from .base import _ConnectionFairy
+from .base import _ConnectionRecord
+from .base import _finalize_fairy
 from .base import Pool
 from .base import reset_commit
 from .base import reset_none

diff --git a/lib/sqlalchemy/sql/__init__.py b/lib/sqlalchemy/sql/__init__.py
index 7ee0bd8f420dcecdf2635a31b6a3842dfc828660..35621e93d170e171de2fccf10e3efe410a43e7a2 100644 (file)
--- a/lib/sqlalchemy/sql/__init__.py
+++ b/lib/sqlalchemy/sql/__init__.py
@@ -5,92 +5,92 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from .base import Executable  # noqa
-from .compiler import COLLECT_CARTESIAN_PRODUCTS  # noqa
-from .compiler import FROM_LINTING  # noqa
-from .compiler import NO_LINTING  # noqa
-from .compiler import WARN_LINTING  # noqa
-from .expression import Alias  # noqa
-from .expression import alias  # noqa
-from .expression import all_  # noqa
-from .expression import and_  # noqa
-from .expression import any_  # noqa
-from .expression import asc  # noqa
-from .expression import between  # noqa
-from .expression import bindparam  # noqa
-from .expression import case  # noqa
-from .expression import cast  # noqa
-from .expression import ClauseElement  # noqa
-from .expression import collate  # noqa
-from .expression import column  # noqa
-from .expression import ColumnCollection  # noqa
-from .expression import ColumnElement  # noqa
-from .expression import CompoundSelect  # noqa
-from .expression import cte  # noqa
-from .expression import Delete  # noqa
-from .expression import delete  # noqa
-from .expression import desc  # noqa
-from .expression import distinct  # noqa
-from .expression import except_  # noqa
-from .expression import except_all  # noqa
-from .expression import exists  # noqa
-from .expression import extract  # noqa
-from .expression import false  # noqa
-from .expression import False_  # noqa
-from .expression import FromClause  # noqa
-from .expression import func  # noqa
-from .expression import funcfilter  # noqa
-from .expression import Insert  # noqa
-from .expression import insert  # noqa
-from .expression import intersect  # noqa
-from .expression import intersect_all  # noqa
-from .expression import Join  # noqa
-from .expression import join  # noqa
-from .expression import label  # noqa
-from .expression import LABEL_STYLE_DEFAULT  # noqa
-from .expression import LABEL_STYLE_DISAMBIGUATE_ONLY  # noqa
-from .expression import LABEL_STYLE_NONE  # noqa
-from .expression import LABEL_STYLE_TABLENAME_PLUS_COL  # noqa
-from .expression import lambda_stmt  # noqa
-from .expression import LambdaElement  # noqa
-from .expression import lateral  # noqa
-from .expression import literal  # noqa
-from .expression import literal_column  # noqa
-from .expression import modifier  # noqa
-from .expression import not_  # noqa
-from .expression import null  # noqa
-from .expression import nulls_first  # noqa
-from .expression import nulls_last  # noqa
-from .expression import nullsfirst  # noqa
-from .expression import nullslast  # noqa
-from .expression import or_  # noqa
-from .expression import outerjoin  # noqa
-from .expression import outparam  # noqa
-from .expression import over  # noqa
-from .expression import quoted_name  # noqa
-from .expression import Select  # noqa
-from .expression import select  # noqa
-from .expression import Selectable  # noqa
-from .expression import StatementLambdaElement  # noqa
-from .expression import Subquery  # noqa
-from .expression import subquery  # noqa
-from .expression import table  # noqa
-from .expression import TableClause  # noqa
-from .expression import TableSample  # noqa
-from .expression import tablesample  # noqa
-from .expression import text  # noqa
-from .expression import true  # noqa
-from .expression import True_  # noqa
-from .expression import tuple_  # noqa
-from .expression import type_coerce  # noqa
-from .expression import union  # noqa
-from .expression import union_all  # noqa
-from .expression import Update  # noqa
-from .expression import update  # noqa
-from .expression import Values  # noqa
-from .expression import values  # noqa
-from .expression import within_group  # noqa
-from .visitors import ClauseVisitor  # noqa
+from .base import Executable
+from .compiler import COLLECT_CARTESIAN_PRODUCTS
+from .compiler import FROM_LINTING
+from .compiler import NO_LINTING
+from .compiler import WARN_LINTING
+from .expression import Alias
+from .expression import alias
+from .expression import all_
+from .expression import and_
+from .expression import any_
+from .expression import asc
+from .expression import between
+from .expression import bindparam
+from .expression import case
+from .expression import cast
+from .expression import ClauseElement
+from .expression import collate
+from .expression import column
+from .expression import ColumnCollection
+from .expression import ColumnElement
+from .expression import CompoundSelect
+from .expression import cte
+from .expression import Delete
+from .expression import delete
+from .expression import desc
+from .expression import distinct
+from .expression import except_
+from .expression import except_all
+from .expression import exists
+from .expression import extract
+from .expression import false
+from .expression import False_
+from .expression import FromClause
+from .expression import func
+from .expression import funcfilter
+from .expression import Insert
+from .expression import insert
+from .expression import intersect
+from .expression import intersect_all
+from .expression import Join
+from .expression import join
+from .expression import label
+from .expression import LABEL_STYLE_DEFAULT
+from .expression import LABEL_STYLE_DISAMBIGUATE_ONLY
+from .expression import LABEL_STYLE_NONE
+from .expression import LABEL_STYLE_TABLENAME_PLUS_COL
+from .expression import lambda_stmt
+from .expression import LambdaElement
+from .expression import lateral
+from .expression import literal
+from .expression import literal_column
+from .expression import modifier
+from .expression import not_
+from .expression import null
+from .expression import nulls_first
+from .expression import nulls_last
+from .expression import nullsfirst
+from .expression import nullslast
+from .expression import or_
+from .expression import outerjoin
+from .expression import outparam
+from .expression import over
+from .expression import quoted_name
+from .expression import Select
+from .expression import select
+from .expression import Selectable
+from .expression import StatementLambdaElement
+from .expression import Subquery
+from .expression import subquery
+from .expression import table
+from .expression import TableClause
+from .expression import TableSample
+from .expression import tablesample
+from .expression import text
+from .expression import true
+from .expression import True_
+from .expression import tuple_
+from .expression import type_coerce
+from .expression import union
+from .expression import union_all
+from .expression import Update
+from .expression import update
+from .expression import Values
+from .expression import values
+from .expression import within_group
+from .visitors import ClauseVisitor
 
 
 def __go(lcls):
@@ -106,17 +106,17 @@ def __go(lcls):
     )
 
     from .annotation import _prepare_annotations
-    from .annotation import Annotated  # noqa
+    from .annotation import Annotated
     from .elements import AnnotatedColumnElement
-    from .elements import ClauseList  # noqa
-    from .selectable import AnnotatedFromClause  # noqa
+    from .elements import ClauseList
+    from .selectable import AnnotatedFromClause
 
     # from .traversals import _preconfigure_traversals
 
     from . import base
     from . import coercions
     from . import elements
-    from . import events  # noqa
+    from . import events
     from . import lambdas
     from . import selectable
     from . import schema
@@ -144,7 +144,7 @@ def __go(lcls):
 
     _sa_util.preloaded.import_prefix("sqlalchemy.sql")
 
-    from . import naming  # noqa
+    from . import naming
 
 
 __go(locals())

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 46f13fedda96acc6267bfc7827421b7a7f938b6e..f47dc5fdf0c88052c9576d9a8570f788cb263c09 100644 (file)
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -92,94 +92,94 @@ __all__ = [
 ]
 
 
-from .base import _from_objects  # noqa
-from .base import _select_iterables  # noqa
-from .base import ColumnCollection  # noqa
-from .base import Executable  # noqa
-from .base import PARSE_AUTOCOMMIT  # noqa
-from .dml import Delete  # noqa
-from .dml import Insert  # noqa
-from .dml import Update  # noqa
-from .dml import UpdateBase  # noqa
-from .dml import ValuesBase  # noqa
-from .elements import _truncated_label  # noqa
-from .elements import between  # noqa
-from .elements import BinaryExpression  # noqa
-from .elements import BindParameter  # noqa
-from .elements import BooleanClauseList  # noqa
-from .elements import Case  # noqa
-from .elements import Cast  # noqa
-from .elements import ClauseElement  # noqa
-from .elements import ClauseList  # noqa
-from .elements import collate  # noqa
-from .elements import CollectionAggregate  # noqa
-from .elements import ColumnClause  # noqa
-from .elements import ColumnElement  # noqa
-from .elements import Extract  # noqa
-from .elements import False_  # noqa
-from .elements import FunctionFilter  # noqa
-from .elements import Grouping  # noqa
-from .elements import Label  # noqa
-from .elements import literal  # noqa
-from .elements import literal_column  # noqa
-from .elements import not_  # noqa
-from .elements import Null  # noqa
-from .elements import outparam  # noqa
-from .elements import Over  # noqa
-from .elements import quoted_name  # noqa
-from .elements import ReleaseSavepointClause  # noqa
-from .elements import RollbackToSavepointClause  # noqa
-from .elements import SavepointClause  # noqa
-from .elements import TextClause  # noqa
-from .elements import True_  # noqa
-from .elements import Tuple  # noqa
-from .elements import TypeClause  # noqa
-from .elements import TypeCoerce  # noqa
-from .elements import UnaryExpression  # noqa
-from .elements import WithinGroup  # noqa
-from .functions import func  # noqa
-from .functions import Function  # noqa
-from .functions import FunctionElement  # noqa
-from .functions import modifier  # noqa
-from .lambdas import lambda_stmt  # noqa
-from .lambdas import LambdaElement  # noqa
-from .lambdas import StatementLambdaElement  # noqa
-from .operators import ColumnOperators  # noqa
-from .operators import custom_op  # noqa
-from .operators import Operators  # noqa
-from .selectable import Alias  # noqa
-from .selectable import AliasedReturnsRows  # noqa
-from .selectable import CompoundSelect  # noqa
-from .selectable import CTE  # noqa
-from .selectable import Exists  # noqa
-from .selectable import FromClause  # noqa
-from .selectable import FromGrouping  # noqa
-from .selectable import GenerativeSelect  # noqa
-from .selectable import HasCTE  # noqa
-from .selectable import HasPrefixes  # noqa
-from .selectable import HasSuffixes  # noqa
-from .selectable import Join  # noqa
-from .selectable import LABEL_STYLE_DEFAULT  # noqa
-from .selectable import LABEL_STYLE_DISAMBIGUATE_ONLY  # noqa
-from .selectable import LABEL_STYLE_NONE  # noqa
-from .selectable import LABEL_STYLE_TABLENAME_PLUS_COL  # noqa
-from .selectable import Lateral  # noqa
-from .selectable import ReturnsRows  # noqa
-from .selectable import ScalarSelect  # noqa
-from .selectable import Select  # noqa
-from .selectable import Selectable  # noqa
-from .selectable import SelectBase  # noqa
-from .selectable import Subquery  # noqa
-from .selectable import subquery  # noqa
-from .selectable import TableClause  # noqa
-from .selectable import TableSample  # noqa
-from .selectable import TableValuedAlias  # noqa
-from .selectable import TextAsFrom  # noqa
-from .selectable import TextualSelect  # noqa
-from .selectable import Values  # noqa
-from .traversals import CacheKey  # noqa
-from .visitors import Visitable  # noqa
-from ..util.langhelpers import public_factory  # noqa
+from .base import _from_objects
+from .base import _select_iterables
+from .base import ColumnCollection
+from .base import Executable
+from .base import PARSE_AUTOCOMMIT
+from .dml import Delete
+from .dml import Insert
+from .dml import Update
+from .dml import UpdateBase
+from .dml import ValuesBase
+from .elements import _truncated_label
+from .elements import between
+from .elements import BinaryExpression
+from .elements import BindParameter
+from .elements import BooleanClauseList
+from .elements import Case
+from .elements import Cast
+from .elements import ClauseElement
+from .elements import ClauseList
+from .elements import collate
+from .elements import CollectionAggregate
+from .elements import ColumnClause
+from .elements import ColumnElement
+from .elements import Extract
+from .elements import False_
+from .elements import FunctionFilter
+from .elements import Grouping
+from .elements import Label
+from .elements import literal
+from .elements import literal_column
+from .elements import not_
+from .elements import Null
+from .elements import outparam
+from .elements import Over
+from .elements import quoted_name
+from .elements import ReleaseSavepointClause
+from .elements import RollbackToSavepointClause
+from .elements import SavepointClause
+from .elements import TextClause
+from .elements import True_
+from .elements import Tuple
+from .elements import TypeClause
+from .elements import TypeCoerce
+from .elements import UnaryExpression
+from .elements import WithinGroup
+from .functions import func
+from .functions import Function
+from .functions import FunctionElement
+from .functions import modifier
+from .lambdas import lambda_stmt
+from .lambdas import LambdaElement
+from .lambdas import StatementLambdaElement
+from .operators import ColumnOperators
+from .operators import custom_op
+from .operators import Operators
+from .selectable import Alias
+from .selectable import AliasedReturnsRows
+from .selectable import CompoundSelect
+from .selectable import CTE
+from .selectable import Exists
+from .selectable import FromClause
+from .selectable import FromGrouping
+from .selectable import GenerativeSelect
+from .selectable import HasCTE
+from .selectable import HasPrefixes
+from .selectable import HasSuffixes
+from .selectable import Join
+from .selectable import LABEL_STYLE_DEFAULT
+from .selectable import LABEL_STYLE_DISAMBIGUATE_ONLY
+from .selectable import LABEL_STYLE_NONE
+from .selectable import LABEL_STYLE_TABLENAME_PLUS_COL
+from .selectable import Lateral
+from .selectable import ReturnsRows
+from .selectable import ScalarSelect
+from .selectable import Select
+from .selectable import Selectable
+from .selectable import SelectBase
+from .selectable import Subquery
+from .selectable import subquery
+from .selectable import TableClause
+from .selectable import TableSample
+from .selectable import TableValuedAlias
+from .selectable import TextAsFrom
+from .selectable import TextualSelect
+from .selectable import Values
+from .traversals import CacheKey
+from .visitors import Visitable
+from ..util.langhelpers import public_factory
 
 # factory functions - these pull class-bound constructors and classmethods
 # from SQL elements and selectables into public functions.  This allows

diff --git a/lib/sqlalchemy/testing/__init__.py b/lib/sqlalchemy/testing/__init__.py
index 9f2d0b857cf2b9daa0a5dce2cc02a2321db4d6be..adbb8f6433fdb661830e0dedf150d26b99893f55 100644 (file)
--- a/lib/sqlalchemy/testing/__init__.py
+++ b/lib/sqlalchemy/testing/__init__.py
@@ -6,72 +6,72 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-from . import config  # noqa
-from . import mock  # noqa
-from .assertions import assert_raises  # noqa
-from .assertions import assert_raises_context_ok  # noqa
-from .assertions import assert_raises_message  # noqa
-from .assertions import assert_raises_message_context_ok  # noqa
-from .assertions import AssertsCompiledSQL  # noqa
-from .assertions import AssertsExecutionResults  # noqa
-from .assertions import ComparesTables  # noqa
-from .assertions import emits_warning  # noqa
-from .assertions import emits_warning_on  # noqa
-from .assertions import eq_  # noqa
-from .assertions import eq_ignore_whitespace  # noqa
-from .assertions import eq_regex  # noqa
-from .assertions import expect_deprecated  # noqa
-from .assertions import expect_deprecated_20  # noqa
-from .assertions import expect_raises  # noqa
-from .assertions import expect_raises_message  # noqa
-from .assertions import expect_warnings  # noqa
-from .assertions import in_  # noqa
-from .assertions import is_  # noqa
-from .assertions import is_false  # noqa
-from .assertions import is_instance_of  # noqa
-from .assertions import is_none  # noqa
-from .assertions import is_not  # noqa
-from .assertions import is_not_  # noqa
-from .assertions import is_not_none  # noqa
-from .assertions import is_true  # noqa
-from .assertions import le_  # noqa
-from .assertions import ne_  # noqa
-from .assertions import not_in  # noqa
-from .assertions import not_in_  # noqa
-from .assertions import startswith_  # noqa
-from .assertions import uses_deprecated  # noqa
-from .config import async_test  # noqa
-from .config import combinations  # noqa
-from .config import db  # noqa
-from .config import fixture  # noqa
-from .config import requirements as requires  # noqa
-from .exclusions import _is_excluded  # noqa
-from .exclusions import _server_version  # noqa
-from .exclusions import against as _against  # noqa
-from .exclusions import db_spec  # noqa
-from .exclusions import exclude  # noqa
-from .exclusions import fails  # noqa
-from .exclusions import fails_if  # noqa
-from .exclusions import fails_on  # noqa
-from .exclusions import fails_on_everything_except  # noqa
-from .exclusions import future  # noqa
-from .exclusions import only_if  # noqa
-from .exclusions import only_on  # noqa
-from .exclusions import skip  # noqa
-from .exclusions import skip_if  # noqa
-from .schema import eq_type_affinity  # noqa
-from .util import adict  # noqa
-from .util import fail  # noqa
-from .util import flag_combinations  # noqa
-from .util import force_drop_names  # noqa
-from .util import lambda_combinations  # noqa
-from .util import metadata_fixture  # noqa
-from .util import provide_metadata  # noqa
-from .util import resolve_lambda  # noqa
-from .util import rowset  # noqa
-from .util import run_as_contextmanager  # noqa
-from .util import teardown_events  # noqa
-from .warnings import assert_warnings  # noqa
+from . import config
+from . import mock
+from .assertions import assert_raises
+from .assertions import assert_raises_context_ok
+from .assertions import assert_raises_message
+from .assertions import assert_raises_message_context_ok
+from .assertions import AssertsCompiledSQL
+from .assertions import AssertsExecutionResults
+from .assertions import ComparesTables
+from .assertions import emits_warning
+from .assertions import emits_warning_on
+from .assertions import eq_
+from .assertions import eq_ignore_whitespace
+from .assertions import eq_regex
+from .assertions import expect_deprecated
+from .assertions import expect_deprecated_20
+from .assertions import expect_raises
+from .assertions import expect_raises_message
+from .assertions import expect_warnings
+from .assertions import in_
+from .assertions import is_
+from .assertions import is_false
+from .assertions import is_instance_of
+from .assertions import is_none
+from .assertions import is_not
+from .assertions import is_not_
+from .assertions import is_not_none
+from .assertions import is_true
+from .assertions import le_
+from .assertions import ne_
+from .assertions import not_in
+from .assertions import not_in_
+from .assertions import startswith_
+from .assertions import uses_deprecated
+from .config import async_test
+from .config import combinations
+from .config import db
+from .config import fixture
+from .config import requirements as requires
+from .exclusions import _is_excluded
+from .exclusions import _server_version
+from .exclusions import against as _against
+from .exclusions import db_spec
+from .exclusions import exclude
+from .exclusions import fails
+from .exclusions import fails_if
+from .exclusions import fails_on
+from .exclusions import fails_on_everything_except
+from .exclusions import future
+from .exclusions import only_if
+from .exclusions import only_on
+from .exclusions import skip
+from .exclusions import skip_if
+from .schema import eq_type_affinity
+from .util import adict
+from .util import fail
+from .util import flag_combinations
+from .util import force_drop_names
+from .util import lambda_combinations
+from .util import metadata_fixture
+from .util import provide_metadata
+from .util import resolve_lambda
+from .util import rowset
+from .util import run_as_contextmanager
+from .util import teardown_events
+from .warnings import assert_warnings
 
 
 def against(*queries):

diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index 9340546ca251c9c6ddb1805d1736b9956a74ae84..6cc3e6fbc3628d8a74a0aba41e0f02bdc5fa0535 100644 (file)
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -58,58 +58,58 @@ __all__ = [
     "JSON",
 ]
 
-from .sql.sqltypes import _Binary  # noqa
-from .sql.sqltypes import ARRAY  # noqa
-from .sql.sqltypes import BIGINT  # noqa
-from .sql.sqltypes import BigInteger  # noqa
-from .sql.sqltypes import BINARY  # noqa
-from .sql.sqltypes import BLOB  # noqa
-from .sql.sqltypes import BOOLEAN  # noqa
-from .sql.sqltypes import Boolean  # noqa
-from .sql.sqltypes import CHAR  # noqa
-from .sql.sqltypes import CLOB  # noqa
-from .sql.sqltypes import Concatenable  # noqa
-from .sql.sqltypes import DATE  # noqa
-from .sql.sqltypes import Date  # noqa
-from .sql.sqltypes import DATETIME  # noqa
-from .sql.sqltypes import DateTime  # noqa
-from .sql.sqltypes import DECIMAL  # noqa
-from .sql.sqltypes import Enum  # noqa
-from .sql.sqltypes import FLOAT  # noqa
-from .sql.sqltypes import Float  # noqa
-from .sql.sqltypes import Indexable  # noqa
-from .sql.sqltypes import INT  # noqa
-from .sql.sqltypes import INTEGER  # noqa
-from .sql.sqltypes import Integer  # noqa
-from .sql.sqltypes import Interval  # noqa
-from .sql.sqltypes import JSON  # noqa
-from .sql.sqltypes import LargeBinary  # noqa
-from .sql.sqltypes import MatchType  # noqa
-from .sql.sqltypes import NCHAR  # noqa
-from .sql.sqltypes import NULLTYPE  # noqa
-from .sql.sqltypes import NullType  # noqa
-from .sql.sqltypes import NUMERIC  # noqa
-from .sql.sqltypes import Numeric  # noqa
-from .sql.sqltypes import NVARCHAR  # noqa
-from .sql.sqltypes import PickleType  # noqa
-from .sql.sqltypes import REAL  # noqa
-from .sql.sqltypes import SchemaType  # noqa
-from .sql.sqltypes import SMALLINT  # noqa
-from .sql.sqltypes import SmallInteger  # noqa
-from .sql.sqltypes import String  # noqa
-from .sql.sqltypes import STRINGTYPE  # noqa
-from .sql.sqltypes import TEXT  # noqa
-from .sql.sqltypes import Text  # noqa
-from .sql.sqltypes import TIME  # noqa
-from .sql.sqltypes import Time  # noqa
-from .sql.sqltypes import TIMESTAMP  # noqa
-from .sql.sqltypes import Unicode  # noqa
-from .sql.sqltypes import UnicodeText  # noqa
-from .sql.sqltypes import VARBINARY  # noqa
-from .sql.sqltypes import VARCHAR  # noqa
-from .sql.type_api import adapt_type  # noqa
-from .sql.type_api import to_instance  # noqa
-from .sql.type_api import TypeDecorator  # noqa
-from .sql.type_api import TypeEngine  # noqa
-from .sql.type_api import UserDefinedType  # noqa
-from .sql.type_api import Variant  # noqa
+from .sql.sqltypes import _Binary
+from .sql.sqltypes import ARRAY
+from .sql.sqltypes import BIGINT
+from .sql.sqltypes import BigInteger
+from .sql.sqltypes import BINARY
+from .sql.sqltypes import BLOB
+from .sql.sqltypes import BOOLEAN
+from .sql.sqltypes import Boolean
+from .sql.sqltypes import CHAR
+from .sql.sqltypes import CLOB
+from .sql.sqltypes import Concatenable
+from .sql.sqltypes import DATE
+from .sql.sqltypes import Date
+from .sql.sqltypes import DATETIME
+from .sql.sqltypes import DateTime
+from .sql.sqltypes import DECIMAL
+from .sql.sqltypes import Enum
+from .sql.sqltypes import FLOAT
+from .sql.sqltypes import Float
+from .sql.sqltypes import Indexable
+from .sql.sqltypes import INT
+from .sql.sqltypes import INTEGER
+from .sql.sqltypes import Integer
+from .sql.sqltypes import Interval
+from .sql.sqltypes import JSON
+from .sql.sqltypes import LargeBinary
+from .sql.sqltypes import MatchType
+from .sql.sqltypes import NCHAR
+from .sql.sqltypes import NULLTYPE
+from .sql.sqltypes import NullType
+from .sql.sqltypes import NUMERIC
+from .sql.sqltypes import Numeric
+from .sql.sqltypes import NVARCHAR
+from .sql.sqltypes import PickleType
+from .sql.sqltypes import REAL
+from .sql.sqltypes import SchemaType
+from .sql.sqltypes import SMALLINT
+from .sql.sqltypes import SmallInteger
+from .sql.sqltypes import String
+from .sql.sqltypes import STRINGTYPE
+from .sql.sqltypes import TEXT
+from .sql.sqltypes import Text
+from .sql.sqltypes import TIME
+from .sql.sqltypes import Time
+from .sql.sqltypes import TIMESTAMP
+from .sql.sqltypes import Unicode
+from .sql.sqltypes import UnicodeText
+from .sql.sqltypes import VARBINARY
+from .sql.sqltypes import VARCHAR
+from .sql.type_api import adapt_type
+from .sql.type_api import to_instance
+from .sql.type_api import TypeDecorator
+from .sql.type_api import TypeEngine
+from .sql.type_api import UserDefinedType
+from .sql.type_api import Variant

diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 4b61658b21df9600fcdff157d78acf4629254d2a..89d09f930fa76b0b9f87dfb994b0b9ee8044c36c 100644 (file)
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -6,165 +6,165 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-from collections import defaultdict  # noqa
-from contextlib import contextmanager  # noqa
-from functools import partial  # noqa
-from functools import update_wrapper  # noqa
+from collections import defaultdict
+from contextlib import contextmanager
+from functools import partial
+from functools import update_wrapper
 
-from ._collections import coerce_generator_arg  # noqa
-from ._collections import coerce_to_immutabledict  # noqa
-from ._collections import collections_abc  # noqa
-from ._collections import column_dict  # noqa
-from ._collections import column_set  # noqa
-from ._collections import EMPTY_DICT  # noqa
-from ._collections import EMPTY_SET  # noqa
-from ._collections import FacadeDict  # noqa
-from ._collections import flatten_iterator  # noqa
-from ._collections import has_dupes  # noqa
-from ._collections import has_intersection  # noqa
-from ._collections import IdentitySet  # noqa
-from ._collections import ImmutableContainer  # noqa
-from ._collections import immutabledict  # noqa
-from ._collections import ImmutableProperties  # noqa
-from ._collections import LRUCache  # noqa
-from ._collections import ordered_column_set  # noqa
-from ._collections import OrderedDict  # noqa
-from ._collections import OrderedIdentitySet  # noqa
-from ._collections import OrderedProperties  # noqa
-from ._collections import OrderedSet  # noqa
-from ._collections import PopulateDict  # noqa
-from ._collections import Properties  # noqa
-from ._collections import ScopedRegistry  # noqa
-from ._collections import sort_dictionary  # noqa
-from ._collections import ThreadLocalRegistry  # noqa
-from ._collections import to_column_set  # noqa
-from ._collections import to_list  # noqa
-from ._collections import to_set  # noqa
-from ._collections import unique_list  # noqa
-from ._collections import UniqueAppender  # noqa
-from ._collections import update_copy  # noqa
-from ._collections import WeakPopulateDict  # noqa
-from ._collections import WeakSequence  # noqa
-from ._preloaded import preload_module  # noqa
-from ._preloaded import preloaded  # noqa
-from .compat import ABC  # noqa
-from .compat import arm  # noqa
-from .compat import b  # noqa
-from .compat import b64decode  # noqa
-from .compat import b64encode  # noqa
-from .compat import binary_type  # noqa
-from .compat import byte_buffer  # noqa
-from .compat import callable  # noqa
-from .compat import cmp  # noqa
-from .compat import cpython  # noqa
-from .compat import dataclass_fields  # noqa
-from .compat import decode_backslashreplace  # noqa
-from .compat import dottedgetter  # noqa
-from .compat import has_refcount_gc  # noqa
-from .compat import inspect_getfullargspec  # noqa
-from .compat import int_types  # noqa
-from .compat import iterbytes  # noqa
-from .compat import itertools_filter  # noqa
-from .compat import itertools_filterfalse  # noqa
-from .compat import local_dataclass_fields  # noqa
-from .compat import namedtuple  # noqa
-from .compat import next  # noqa
-from .compat import nullcontext  # noqa
-from .compat import osx  # noqa
-from .compat import parse_qsl  # noqa
-from .compat import perf_counter  # noqa
-from .compat import pickle  # noqa
-from .compat import print_  # noqa
-from .compat import py2k  # noqa
-from .compat import py37  # noqa
-from .compat import py3k  # noqa
-from .compat import pypy  # noqa
-from .compat import quote_plus  # noqa
-from .compat import raise_  # noqa
-from .compat import raise_from_cause  # noqa
-from .compat import reduce  # noqa
-from .compat import reraise  # noqa
-from .compat import string_types  # noqa
-from .compat import StringIO  # noqa
-from .compat import text_type  # noqa
-from .compat import threading  # noqa
-from .compat import timezone  # noqa
-from .compat import TYPE_CHECKING  # noqa
-from .compat import u  # noqa
-from .compat import ue  # noqa
-from .compat import unquote  # noqa
-from .compat import unquote_plus  # noqa
-from .compat import win32  # noqa
-from .compat import with_metaclass  # noqa
-from .compat import zip_longest  # noqa
-from .concurrency import asyncio  # noqa
-from .concurrency import await_fallback  # noqa
-from .concurrency import await_only  # noqa
-from .concurrency import greenlet_spawn  # noqa
-from .deprecations import deprecated  # noqa
-from .deprecations import deprecated_20  # noqa
-from .deprecations import deprecated_20_cls  # noqa
-from .deprecations import deprecated_cls  # noqa
-from .deprecations import deprecated_params  # noqa
-from .deprecations import inject_docstring_text  # noqa
-from .deprecations import moved_20  # noqa
-from .deprecations import SQLALCHEMY_WARN_20  # noqa
-from .deprecations import warn_deprecated  # noqa
-from .deprecations import warn_deprecated_20  # noqa
-from .langhelpers import add_parameter_text  # noqa
-from .langhelpers import as_interface  # noqa
-from .langhelpers import asbool  # noqa
-from .langhelpers import asint  # noqa
-from .langhelpers import assert_arg_type  # noqa
-from .langhelpers import attrsetter  # noqa
-from .langhelpers import bool_or_str  # noqa
-from .langhelpers import chop_traceback  # noqa
-from .langhelpers import class_hierarchy  # noqa
-from .langhelpers import classproperty  # noqa
-from .langhelpers import clsname_as_plain_name  # noqa
-from .langhelpers import coerce_kw_type  # noqa
-from .langhelpers import constructor_copy  # noqa
-from .langhelpers import constructor_key  # noqa
-from .langhelpers import counter  # noqa
-from .langhelpers import create_proxy_methods  # noqa
-from .langhelpers import decode_slice  # noqa
-from .langhelpers import decorator  # noqa
-from .langhelpers import dictlike_iteritems  # noqa
-from .langhelpers import duck_type_collection  # noqa
-from .langhelpers import ellipses_string  # noqa
-from .langhelpers import EnsureKWArgType  # noqa
-from .langhelpers import format_argspec_init  # noqa
-from .langhelpers import format_argspec_plus  # noqa
-from .langhelpers import generic_repr  # noqa
-from .langhelpers import get_callable_argspec  # noqa
-from .langhelpers import get_cls_kwargs  # noqa
-from .langhelpers import get_func_kwargs  # noqa
-from .langhelpers import getargspec_init  # noqa
-from .langhelpers import has_compiled_ext  # noqa
-from .langhelpers import HasMemoized  # noqa
-from .langhelpers import hybridmethod  # noqa
-from .langhelpers import hybridproperty  # noqa
-from .langhelpers import iterate_attributes  # noqa
-from .langhelpers import map_bits  # noqa
-from .langhelpers import md5_hex  # noqa
-from .langhelpers import memoized_instancemethod  # noqa
-from .langhelpers import memoized_property  # noqa
-from .langhelpers import MemoizedSlots  # noqa
-from .langhelpers import method_is_overridden  # noqa
-from .langhelpers import methods_equivalent  # noqa
-from .langhelpers import monkeypatch_proxied_specials  # noqa
-from .langhelpers import NoneType  # noqa
-from .langhelpers import only_once  # noqa
-from .langhelpers import PluginLoader  # noqa
-from .langhelpers import portable_instancemethod  # noqa
-from .langhelpers import quoted_token_parser  # noqa
-from .langhelpers import safe_reraise  # noqa
-from .langhelpers import set_creation_order  # noqa
-from .langhelpers import string_or_unprintable  # noqa
-from .langhelpers import symbol  # noqa
-from .langhelpers import unbound_method_to_callable  # noqa
-from .langhelpers import walk_subclasses  # noqa
-from .langhelpers import warn  # noqa
-from .langhelpers import warn_exception  # noqa
-from .langhelpers import warn_limited  # noqa
-from .langhelpers import wrap_callable  # noqa
+from ._collections import coerce_generator_arg
+from ._collections import coerce_to_immutabledict
+from ._collections import collections_abc
+from ._collections import column_dict
+from ._collections import column_set
+from ._collections import EMPTY_DICT
+from ._collections import EMPTY_SET
+from ._collections import FacadeDict
+from ._collections import flatten_iterator
+from ._collections import has_dupes
+from ._collections import has_intersection
+from ._collections import IdentitySet
+from ._collections import ImmutableContainer
+from ._collections import immutabledict
+from ._collections import ImmutableProperties
+from ._collections import LRUCache
+from ._collections import ordered_column_set
+from ._collections import OrderedDict
+from ._collections import OrderedIdentitySet
+from ._collections import OrderedProperties
+from ._collections import OrderedSet
+from ._collections import PopulateDict
+from ._collections import Properties
+from ._collections import ScopedRegistry
+from ._collections import sort_dictionary
+from ._collections import ThreadLocalRegistry
+from ._collections import to_column_set
+from ._collections import to_list
+from ._collections import to_set
+from ._collections import unique_list
+from ._collections import UniqueAppender
+from ._collections import update_copy
+from ._collections import WeakPopulateDict
+from ._collections import WeakSequence
+from ._preloaded import preload_module
+from ._preloaded import preloaded
+from .compat import ABC
+from .compat import arm
+from .compat import b
+from .compat import b64decode
+from .compat import b64encode
+from .compat import binary_type
+from .compat import byte_buffer
+from .compat import callable
+from .compat import cmp
+from .compat import cpython
+from .compat import dataclass_fields
+from .compat import decode_backslashreplace
+from .compat import dottedgetter
+from .compat import has_refcount_gc
+from .compat import inspect_getfullargspec
+from .compat import int_types
+from .compat import iterbytes
+from .compat import itertools_filter
+from .compat import itertools_filterfalse
+from .compat import local_dataclass_fields
+from .compat import namedtuple
+from .compat import next
+from .compat import nullcontext
+from .compat import osx
+from .compat import parse_qsl
+from .compat import perf_counter
+from .compat import pickle
+from .compat import print_
+from .compat import py2k
+from .compat import py37
+from .compat import py3k
+from .compat import pypy
+from .compat import quote_plus
+from .compat import raise_
+from .compat import raise_from_cause
+from .compat import reduce
+from .compat import reraise
+from .compat import string_types
+from .compat import StringIO
+from .compat import text_type
+from .compat import threading
+from .compat import timezone
+from .compat import TYPE_CHECKING
+from .compat import u
+from .compat import ue
+from .compat import unquote
+from .compat import unquote_plus
+from .compat import win32
+from .compat import with_metaclass
+from .compat import zip_longest
+from .concurrency import asyncio
+from .concurrency import await_fallback
+from .concurrency import await_only
+from .concurrency import greenlet_spawn
+from .deprecations import deprecated
+from .deprecations import deprecated_20
+from .deprecations import deprecated_20_cls
+from .deprecations import deprecated_cls
+from .deprecations import deprecated_params
+from .deprecations import inject_docstring_text
+from .deprecations import moved_20
+from .deprecations import SQLALCHEMY_WARN_20
+from .deprecations import warn_deprecated
+from .deprecations import warn_deprecated_20
+from .langhelpers import add_parameter_text
+from .langhelpers import as_interface
+from .langhelpers import asbool
+from .langhelpers import asint
+from .langhelpers import assert_arg_type
+from .langhelpers import attrsetter
+from .langhelpers import bool_or_str
+from .langhelpers import chop_traceback
+from .langhelpers import class_hierarchy
+from .langhelpers import classproperty
+from .langhelpers import clsname_as_plain_name
+from .langhelpers import coerce_kw_type
+from .langhelpers import constructor_copy
+from .langhelpers import constructor_key
+from .langhelpers import counter
+from .langhelpers import create_proxy_methods
+from .langhelpers import decode_slice
+from .langhelpers import decorator
+from .langhelpers import dictlike_iteritems
+from .langhelpers import duck_type_collection
+from .langhelpers import ellipses_string
+from .langhelpers import EnsureKWArgType
+from .langhelpers import format_argspec_init
+from .langhelpers import format_argspec_plus
+from .langhelpers import generic_repr
+from .langhelpers import get_callable_argspec
+from .langhelpers import get_cls_kwargs
+from .langhelpers import get_func_kwargs
+from .langhelpers import getargspec_init
+from .langhelpers import has_compiled_ext
+from .langhelpers import HasMemoized
+from .langhelpers import hybridmethod
+from .langhelpers import hybridproperty
+from .langhelpers import iterate_attributes
+from .langhelpers import map_bits
+from .langhelpers import md5_hex
+from .langhelpers import memoized_instancemethod
+from .langhelpers import memoized_property
+from .langhelpers import MemoizedSlots
+from .langhelpers import method_is_overridden
+from .langhelpers import methods_equivalent
+from .langhelpers import monkeypatch_proxied_specials
+from .langhelpers import NoneType
+from .langhelpers import only_once
+from .langhelpers import PluginLoader
+from .langhelpers import portable_instancemethod
+from .langhelpers import quoted_token_parser
+from .langhelpers import safe_reraise
+from .langhelpers import set_creation_order
+from .langhelpers import string_or_unprintable
+from .langhelpers import symbol
+from .langhelpers import unbound_method_to_callable
+from .langhelpers import walk_subclasses
+from .langhelpers import warn
+from .langhelpers import warn_exception
+from .langhelpers import warn_limited
+from .langhelpers import wrap_callable

diff --git a/setup.cfg b/setup.cfg
index cdd9894d64fad34fa882d9269862492f9156be7b..1e11063f3b048c37fbb5257d33eb3f548cba1841 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -101,6 +101,12 @@ ignore =
 exclude = .venv,.git,.tox,dist,doc,*egg,build
 import-order-style = google
 application-import-names = sqlalchemy,test
+per-file-ignores =
+                **/__init__.py:F401
+                lib/sqlalchemy/events.py:F401
+                lib/sqlalchemy/schema.py:F401
+                lib/sqlalchemy/types.py:F401
+                lib/sqlalchemy/sql/expression.py:F401
 
 [sqla_testing]
 requirement_cls = test.requirements:DefaultRequirements