Update black flak8 and zimports

Change-Id: I488c9557eda390e4a88319affd4c8813ee274f80

16 files changed, 19 insertions, 20 deletions

diff --git a/test/dialect/oracle/test_reflection.py b/test/dialect/oracle/test_reflection.py
index f9ce1a30b..acf7d75d5 100644
--- a/test/dialect/oracle/test_reflection.py
+++ b/test/dialect/oracle/test_reflection.py
@@ -742,7 +742,7 @@ class DBLinkReflectionTest(fixtures.TestBase):
             conn.exec_driver_sql("drop table test_table")
 
     def test_reflection(self):
-        """test the resolution of the synonym/dblink. """
+        """test the resolution of the synonym/dblink."""
         m = MetaData()
 
         t = Table(
diff --git a/test/dialect/postgresql/test_dialect.py b/test/dialect/postgresql/test_dialect.py
index 138278822..69bb41e2c 100644
--- a/test/dialect/postgresql/test_dialect.py
+++ b/test/dialect/postgresql/test_dialect.py
@@ -62,7 +62,7 @@ if True:
 
 
 class DialectTest(fixtures.TestBase):
-    """python-side dialect tests.  """
+    """python-side dialect tests."""
 
     def test_version_parsing(self):
         def mock_conn(res):
diff --git a/test/dialect/postgresql/test_types.py b/test/dialect/postgresql/test_types.py
index da550bcb9..c83fe0f8a 100644
--- a/test/dialect/postgresql/test_types.py
+++ b/test/dialect/postgresql/test_types.py
@@ -2443,7 +2443,7 @@ class SpecialTypesCompileTest(fixtures.TestBase, AssertsCompiledSQL):
 
 class SpecialTypesTest(fixtures.TablesTest, ComparesTables):
 
-    """test DDL and reflection of PG-specific types """
+    """test DDL and reflection of PG-specific types"""
 
     __only_on__ = ("postgresql >= 8.3.0",)
     __backend__ = True
diff --git a/test/ext/declarative/test_inheritance.py b/test/ext/declarative/test_inheritance.py
index 20d509ca5..a8292752a 100644
--- a/test/ext/declarative/test_inheritance.py
+++ b/test/ext/declarative/test_inheritance.py
@@ -750,7 +750,7 @@ class ConcreteExtensionConfigTest(
         )
 
     def test_prop_on_base(self):
-        """test [ticket:2670] """
+        """test [ticket:2670]"""
 
         counter = mock.Mock()
 
diff --git a/test/ext/mypy/incremental/stubs_14/address.py b/test/ext/mypy/incremental/stubs_14/address.py
index dd1627316..061dbc6da 100644
--- a/test/ext/mypy/incremental/stubs_14/address.py
+++ b/test/ext/mypy/incremental/stubs_14/address.py
@@ -4,9 +4,10 @@ from . import Base
 from .user import HasUser
 
 if TYPE_CHECKING:
-    from .user import User  # noqa
-    from sqlalchemy import Integer, Column  # noqa
+    from sqlalchemy import Column  # noqa
+    from sqlalchemy import Integer  # noqa
     from sqlalchemy.orm import RelationshipProperty  # noqa
+    from .user import User  # noqa
 
 
 class Address(Base, HasUser):
diff --git a/test/ext/test_orderinglist.py b/test/ext/test_orderinglist.py
index 280fad6cf..13ebda24e 100644
--- a/test/ext/test_orderinglist.py
+++ b/test/ext/test_orderinglist.py
@@ -18,7 +18,7 @@ metadata = None
 
 
 def step_numbering(step):
-    """ order in whole steps """
+    """order in whole steps"""
 
     def f(index, collection):
         return step * index
diff --git a/test/orm/declarative/test_inheritance.py b/test/orm/declarative/test_inheritance.py
index e09b1570e..a1e5c605b 100644
--- a/test/orm/declarative/test_inheritance.py
+++ b/test/orm/declarative/test_inheritance.py
@@ -906,10 +906,10 @@ class DeclarativeInheritanceTest(DeclarativeTestBase):
             __tablename__ = "person"
 
         class Engineer(Person):
-            """ single table inheritance, no extra cols """
+            """single table inheritance, no extra cols"""
 
         class Manager(Person):
-            """ single table inheritance, no extra cols """
+            """single table inheritance, no extra cols"""
 
         is_(Engineer.id.property.columns[0], Person.__table__.c.id)
         is_(Manager.id.property.columns[0], Person.__table__.c.id)
diff --git a/test/orm/inheritance/test_relationship.py b/test/orm/inheritance/test_relationship.py
index d983ddac9..b9f3ac01d 100644
--- a/test/orm/inheritance/test_relationship.py
+++ b/test/orm/inheritance/test_relationship.py
@@ -1885,7 +1885,7 @@ class SubClassToSubClassMultiTest(AssertsCompiledSQL, fixtures.MappedTest):
 class JoinedloadWPolyOfTypeContinued(
     fixtures.DeclarativeMappedTest, testing.AssertsCompiledSQL
 ):
-    """test for #5082 """
+    """test for #5082"""
 
     @classmethod
     def setup_classes(cls):
@@ -2045,7 +2045,7 @@ class JoinedloadWPolyOfTypeContinued(
 class ContainsEagerMultipleOfType(
     fixtures.DeclarativeMappedTest, testing.AssertsCompiledSQL
 ):
-    """test for #5107 """
+    """test for #5107"""
 
     __dialect__ = "default"
 
diff --git a/test/orm/test_session.py b/test/orm/test_session.py
index d6cd83d6a..421e6320b 100644
--- a/test/orm/test_session.py
+++ b/test/orm/test_session.py
@@ -230,7 +230,7 @@ class TransScopingTest(_fixtures.FixtureTest):
     def test_autobegin_attr_change(
         self, case_, autocommit, begin, modify_unconditional, expire_on_commit
     ):
-        """test :ticket:`6360` """
+        """test :ticket:`6360`"""
 
         User, users = self.classes.User, self.tables.users
 
diff --git a/test/orm/test_update_delete.py b/test/orm/test_update_delete.py
index f0df420fc..9c8c4a5fc 100644
--- a/test/orm/test_update_delete.py
+++ b/test/orm/test_update_delete.py
@@ -1046,7 +1046,7 @@ class UpdateDeleteTest(fixtures.MappedTest):
         not_in(jane, sess)
 
     def test_update_with_filter_statement(self):
-        """test for [ticket:4556] """
+        """test for [ticket:4556]"""
 
         User = self.classes.User
 
diff --git a/test/sql/test_cte.py b/test/sql/test_cte.py
index 25d7e33ba..59358aadf 100644
--- a/test/sql/test_cte.py
+++ b/test/sql/test_cte.py
@@ -265,8 +265,6 @@ class CTETest(fixtures.TestBase, AssertsCompiledSQL):
         )
 
     def test_recursive_union_alias_two(self):
-        """"""
-
         # I know, this is the PG VALUES keyword,
         # we're cheating here.  also yes we need the SELECT,
         # sorry PG.
diff --git a/test/sql/test_deprecations.py b/test/sql/test_deprecations.py
index 8dba8cb83..7b2b6c57e 100644
--- a/test/sql/test_deprecations.py
+++ b/test/sql/test_deprecations.py
@@ -2618,7 +2618,7 @@ class LegacySequenceExecTest(fixtures.TestBase):
             self._assert_seq_result(testing.db.scalar(s.next_value()))
 
     def test_func_implicit_connectionless_scalar(self):
-        """test func.next_value().execute()/.scalar() works. """
+        """test func.next_value().execute()/.scalar() works."""
 
         with testing.expect_deprecated_20(
             r"The MetaData.bind argument is deprecated"
diff --git a/test/sql/test_operators.py b/test/sql/test_operators.py
index 984379c6b..43d9133a7 100644
--- a/test/sql/test_operators.py
+++ b/test/sql/test_operators.py
@@ -2107,7 +2107,7 @@ class InTest(fixtures.TestBase, testing.AssertsCompiledSQL):
         )
 
     def test_scalar_subquery_wo_type(self):
-        """ test for :ticket:`6181` """
+        """test for :ticket:`6181`"""
 
         m = MetaData()
         t = Table("t", m, Column("a", Integer))
diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index a22cf1098..14dc397f6 100644
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -780,7 +780,7 @@ class QueryTest(fixtures.TablesTest):
         )
 
     def test_expanding_in_dont_alter_compiled(self, connection):
-        """test for issue #5048 """
+        """test for issue #5048"""
 
         class NameWithProcess(TypeDecorator):
             impl = String
diff --git a/test/sql/test_roles.py b/test/sql/test_roles.py
index 37f75594b..ff4f10f1a 100644
--- a/test/sql/test_roles.py
+++ b/test/sql/test_roles.py
@@ -147,7 +147,7 @@ class RoleTest(fixtures.TestBase):
         )
 
     def test_untyped_scalar_subquery(self):
-        """test for :ticket:`6181` """
+        """test for :ticket:`6181`"""
 
         c = column("q")
         subq = select(c).scalar_subquery()
diff --git a/test/sql/test_update.py b/test/sql/test_update.py
index 26b0f6217..8004e6a4c 100644
--- a/test/sql/test_update.py
+++ b/test/sql/test_update.py
@@ -369,7 +369,7 @@ class UpdateTest(_UpdateFromTestBase, fixtures.TablesTest, AssertsCompiledSQL):
         )
 
     def test_labels_no_collision_index(self):
-        """test for [ticket:4911] """
+        """test for [ticket:4911]"""
 
         t = Table(
             "foo",