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

diff --git a/doc/build/corrections.py b/doc/build/corrections.py
deleted file mode 100644 (file)
index fa2e13a..0000000
--- a/doc/build/corrections.py
+++ /dev/null
@@ -1,39 +0,0 @@
-targets = {}
-quit = False
-def missing_reference(app, env, node, contnode):
-    global quit
-    if quit:
-        return
-    reftarget = node.attributes['reftarget']
-    reftype = node.attributes['reftype']
-    refdoc = node.attributes['refdoc']
-    rawsource = node.rawsource
-    if reftype == 'paramref':
-        return
-
-    target = rawsource
-    if target in targets:
-        return
-    print "\n%s" % refdoc
-    print "Reftarget: %s" % rawsource
-    correction = raw_input("? ")
-    correction = correction.strip()
-    if correction == ".":
-        correction = ":%s:`.%s`" % (reftype, reftarget)
-    elif correction == 'q':
-        quit = True
-    else:
-        targets[target] = correction
-
-def write_corrections(app, exception):
-    print "#!/bin/sh\n\n"
-    for targ, corr in targets.items():
-        if not corr:
-            continue
-
-        print """find lib/ -print -type f -name "*.py" -exec sed -i '' 's/%s/%s/g' {} \;""" % (targ, corr)
-        print """find doc/build/ -print -type f -name "*.rst" -exec sed -i '' 's/%s/%s/g' {} \;""" % (targ, corr)
-
-def setup(app):
-    app.connect('missing-reference', missing_reference)
-    app.connect('build-finished', write_corrections)

diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py
index 92128ed22f2dc1de43baebbf06c7580d630d9233..5398c2967550f16f518ae73b059bc66aaef18b37 100644 (file)
--- a/lib/sqlalchemy/__init__.py
+++ b/lib/sqlalchemy/__init__.py
@@ -11,13 +11,13 @@ 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 Computed  # noqa
 from .schema import Index  # noqa
 from .schema import MetaData  # noqa
 from .schema import PrimaryKeyConstraint  # noqa

diff --git a/lib/sqlalchemy/dialects/mysql/oursql.py b/lib/sqlalchemy/dialects/mysql/oursql.py
index 1c319f4f2f2fb60ea565490e1d1a2d9404c76ea7..ee6c0b59cb9434eee0eb09b2707d2630002f7fa0 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/oursql.py
+++ b/lib/sqlalchemy/dialects/mysql/oursql.py
@@ -181,9 +181,9 @@ class MySQLDialect_oursql(MySQLDialect):
     ):
         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,

diff --git a/lib/sqlalchemy/dialects/mysql/pyodbc.py b/lib/sqlalchemy/dialects/mysql/pyodbc.py
index ff69ec3451932f2904a65ebccea4903a9bf9820f..a3064b9a6613f85f61230aa4bffb84cddf71d9ad 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/pyodbc.py
+++ b/lib/sqlalchemy/dialects/mysql/pyodbc.py
@@ -119,14 +119,14 @@ class MySQLDialect_pyodbc(PyODBCConnector, MySQLDialect):
             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
 

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 6adeded36d43a05b0a2fad3c21bc2ddaac945aba..f6c95ed7e92baa2b9110aa228943b4815d224951 100644 (file)
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -41,13 +41,13 @@ from .sql.schema import Column  # noqa
 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

diff --git a/lib/sqlalchemy/sql/ddl.py b/lib/sqlalchemy/sql/ddl.py
index 5345dfb6bc212f5eff4a39886b3eef7e5768979c..0acef135e6a53f36ff5791b80861fa4ccb43976f 100644 (file)
--- a/lib/sqlalchemy/sql/ddl.py
+++ b/lib/sqlalchemy/sql/ddl.py
@@ -715,7 +715,7 @@ class SchemaGenerator(DDLBase):
             CreateTable(
                 table,
                 include_foreign_key_constraints=  # noqa
-                    include_foreign_key_constraints,
+                    include_foreign_key_constraints,  # noqa
             )
             # fmt: on
         )

diff --git a/lib/sqlalchemy/testing/engines.py b/lib/sqlalchemy/testing/engines.py
index acc888933c091bcf812e8533ae6c7aac55ea2de1..d5a49af879c064bc93defa47ee951521bb990bb0 100644 (file)
--- a/lib/sqlalchemy/testing/engines.py
+++ b/lib/sqlalchemy/testing/engines.py
@@ -303,9 +303,7 @@ def mock_engine(dialect_name=None):
         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

diff --git a/reap_dbs.py b/reap_dbs.py
index 1e4033be4b4f7d3703364c317c7f84d5558be7f9..81f9b8f26ee8305817f06fb616917337fc9a1afe 100644 (file)
--- a/reap_dbs.py
+++ b/reap_dbs.py
@@ -20,5 +20,3 @@ logging.basicConfig()
 logging.getLogger(provision.__name__).setLevel(logging.INFO)
 
 provision.reap_dbs(sys.argv[1])
-
-

diff --git a/test/ext/test_deprecations.py b/test/ext/test_deprecations.py
index 099393cf772d40002150586b1e494cd4e845c218..841b84cd8d8e255bdb8c233db2ab3a43a2485045 100644 (file)
--- a/test/ext/test_deprecations.py
+++ b/test/ext/test_deprecations.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 @@ class MutableIncludeNonPrimaryTest(_MutableWithScalarJSONTest):
             )
 
 
-class MutableAssocIncludeNonPrimaryTest(_MutableAssociationScalarPickleTest):
+class MutableAssocIncludeNonPrimaryTest(
+    test_mutable.MutableAssociationScalarPickleTest
+):
     @classmethod
     def setup_mappers(cls):
         foo = cls.tables.foo

diff --git a/test/sql/test_cte.py b/test/sql/test_cte.py
index ff5a124817aecd4027837c6903514d6e55bdff01..4a7a80e770987072fe2efff5cebaa6a75306a7bf 100644 (file)
--- a/test/sql/test_cte.py
+++ b/test/sql/test_cte.py
@@ -918,11 +918,11 @@ class CTETest(fixtures.TestBase, AssertsCompiledSQL):
 
         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):