Source base cleanups

in trying to apply 2020 copyright to files, the pre-commit
hooks complain about random file issues.

- remove old corrections.py utility, this had something to do
  with repairing refs in the sphinx docs

- run pre commit hooks on all files

- formatting adjustments to work around code formatting collisions
  (long import lines that zimports can't rewrite correctly)

Change-Id: I260744866f69e902eb93665c7c728ee94d3371a2

Author: zzzeek

doc/build/corrections.py

@@ -11,13 +11,13 @@
 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 Computed  # noqa
 from .schema import Index  # noqa
 from .schema import MetaData  # noqa
 from .schema import PrimaryKeyConstraint  # noqa

lib/sqlalchemy/__init__.py

@@ -181,9 +181,9 @@ def _show_create_table(
     ):
         return MySQLDialect._show_create_table(
             self,
-            connection.connect(
-                close_with_result=True
-            ).execution_options(_oursql_plain_query=True),
+            connection.connect(close_with_result=True).execution_options(
+                _oursql_plain_query=True
+            ),
             table,
             charset,
             full_name,

lib/sqlalchemy/dialects/mysql/oursql.py

@@ -119,14 +119,14 @@ def on_connect(conn):
             pyodbc_SQL_CHAR = 1  # pyodbc.SQL_CHAR
             pyodbc_SQL_WCHAR = -8  # pyodbc.SQL_WCHAR
             if sys.version_info.major > 2:
-                conn.setdecoding(pyodbc_SQL_CHAR, encoding='utf-8')
-                conn.setdecoding(pyodbc_SQL_WCHAR, encoding='utf-8')
-                conn.setencoding(encoding='utf-8')
+                conn.setdecoding(pyodbc_SQL_CHAR, encoding="utf-8")
+                conn.setdecoding(pyodbc_SQL_WCHAR, encoding="utf-8")
+                conn.setencoding(encoding="utf-8")
             else:
-                conn.setdecoding(pyodbc_SQL_CHAR, encoding='utf-8')
-                conn.setdecoding(pyodbc_SQL_WCHAR, encoding='utf-8')
-                conn.setencoding(str, encoding='utf-8')
-                conn.setencoding(unicode, encoding='utf-8')
+                conn.setdecoding(pyodbc_SQL_CHAR, encoding="utf-8")
+                conn.setdecoding(pyodbc_SQL_WCHAR, encoding="utf-8")
+                conn.setencoding(str, encoding="utf-8")
+                conn.setencoding(unicode, encoding="utf-8")
 
         return on_connect
 

lib/sqlalchemy/dialects/mysql/pyodbc.py

@@ -41,13 +41,13 @@
 from .sql.schema import ColumnCollectionConstraint  # noqa
 from .sql.schema import ColumnCollectionMixin  # noqa
 from .sql.schema import ColumnDefault  # noqa
+from .sql.schema import Computed  # noqa
 from .sql.schema import Constraint  # noqa
 from .sql.schema import DefaultClause  # noqa
 from .sql.schema import DefaultGenerator  # noqa
 from .sql.schema import FetchedValue  # noqa
 from .sql.schema import ForeignKey  # noqa
 from .sql.schema import ForeignKeyConstraint  # noqa
-from .sql.schema import Computed  # noqa
 from .sql.schema import Index  # noqa
 from .sql.schema import MetaData  # noqa
 from .sql.schema import PrimaryKeyConstraint  # noqa

lib/sqlalchemy/schema.py

@@ -715,7 +715,7 @@ def visit_table(
             CreateTable(
                 table,
                 include_foreign_key_constraints=  # noqa
-                    include_foreign_key_constraints,
+                    include_foreign_key_constraints,  # noqa
             )
             # fmt: on
         )

lib/sqlalchemy/sql/ddl.py

@@ -303,9 +303,7 @@ def print_sql():
         d = engine.dialect
         return "\n".join(str(s.compile(dialect=d)) for s in engine.mock)
 
-    engine = create_mock_engine(
-        dialect_name + "://", executor
-    )
+    engine = create_mock_engine(dialect_name + "://", executor)
     assert not hasattr(engine, "mock")
     engine.mock = buffer
     engine.assert_sql = assert_sql

lib/sqlalchemy/testing/engines.py

@@ -20,5 +20,3 @@
 logging.getLogger(provision.__name__).setLevel(logging.INFO)
 
 provision.reap_dbs(sys.argv[1])
-
-

reap_dbs.py

@@ -1,15 +1,10 @@
 from sqlalchemy import testing
 from sqlalchemy.orm import mapper
+from . import test_mutable
 from .test_mutable import Foo
-from .test_mutable import (
-    MutableAssociationScalarPickleTest as _MutableAssociationScalarPickleTest,
-)
-from .test_mutable import (
-    MutableWithScalarJSONTest as _MutableWithScalarJSONTest,
-)
 
 
-class MutableIncludeNonPrimaryTest(_MutableWithScalarJSONTest):
+class MutableIncludeNonPrimaryTest(test_mutable.MutableWithScalarJSONTest):
     @classmethod
     def setup_mappers(cls):
         foo = cls.tables.foo
@@ -23,7 +18,9 @@ def setup_mappers(cls):
             )
 
 
-class MutableAssocIncludeNonPrimaryTest(_MutableAssociationScalarPickleTest):
+class MutableAssocIncludeNonPrimaryTest(
+    test_mutable.MutableAssociationScalarPickleTest
+):
     @classmethod
     def setup_mappers(cls):
         foo = cls.tables.foo

test/ext/test_deprecations.py

@@ -918,11 +918,11 @@ def test_prefixes(self):
 
         self.assert_compile(
             stmt,
-            'WITH regional_sales AS NOT MATERIALIZED '
+            "WITH regional_sales AS NOT MATERIALIZED "
             '(SELECT "order"."order" AS "order" '
             'FROM "order") SELECT "order"."order" FROM "order", '
             'regional_sales WHERE "order"."order" > regional_sales."order"',
-            dialect="postgresql"
+            dialect="postgresql",
         )
 
     def test_suffixes(self):