Post black reformatting

Applied on top of a pure run of black -l 79 in
I7eda77fed3d8e73df84b3651fd6cfcfe858d4dc9,  this set of changes
resolves all remaining flake8 conditions for those codes
we have enabled in setup.cfg.

Included are resolutions for all remaining flake8 issues
including shadowed builtins, long lines, import order, unused
imports, duplicate imports, and docstring issues.

Change-Id: I4f72d3ba1380dd601610ff80b8fb06a2aff8b0fe

1 files changed, 65 insertions, 60 deletions

diff --git a/test/sql/test_operators.py b/test/sql/test_operators.py
index 2ce842caf..978d3101d 100644
--- a/test/sql/test_operators.py
+++ b/test/sql/test_operators.py
@@ -1,63 +1,68 @@
-from sqlalchemy.testing import fixtures, eq_, is_, is_not_
-from sqlalchemy import testing
-from sqlalchemy.testing import assert_raises_message
-from sqlalchemy.testing import expect_warnings
-from sqlalchemy.sql import (
-    column,
-    desc,
-    asc,
-    literal,
-    collate,
-    null,
-    true,
-    false,
-    any_,
-    all_,
-)
-from sqlalchemy.sql import sqltypes
-from sqlalchemy.sql.expression import (
-    BinaryExpression,
-    ClauseList,
-    Grouping,
-    UnaryExpression,
-    select,
-    union,
-    func,
-    tuple_,
-)
-from sqlalchemy.sql import operators, table
+import datetime
 import operator
-from sqlalchemy import String, Integer, LargeBinary
+
+from sqlalchemy import and_
+from sqlalchemy import between
 from sqlalchemy import exc
+from sqlalchemy import Integer
+from sqlalchemy import LargeBinary
+from sqlalchemy import literal_column
+from sqlalchemy import not_
+from sqlalchemy import or_
+from sqlalchemy import String
+from sqlalchemy import testing
+from sqlalchemy import text
+from sqlalchemy import util
+from sqlalchemy.dialects import firebird
+from sqlalchemy.dialects import mssql
+from sqlalchemy.dialects import mysql
+from sqlalchemy.dialects import oracle
+from sqlalchemy.dialects import postgresql
+from sqlalchemy.dialects import sqlite
 from sqlalchemy.engine import default
-from sqlalchemy.sql.elements import _literal_as_text, Label
-from sqlalchemy.schema import Column, Table, MetaData
+from sqlalchemy.schema import Column
+from sqlalchemy.schema import MetaData
+from sqlalchemy.schema import Table
+from sqlalchemy.sql import all_
+from sqlalchemy.sql import any_
+from sqlalchemy.sql import asc
+from sqlalchemy.sql import collate
+from sqlalchemy.sql import column
 from sqlalchemy.sql import compiler
-from sqlalchemy.types import (
-    TypeEngine,
-    TypeDecorator,
-    UserDefinedType,
-    Boolean,
-    MatchType,
-    Indexable,
-    Concatenable,
-    ARRAY,
-    JSON,
-    DateTime,
-)
-from sqlalchemy.dialects import (
-    mysql,
-    firebird,
-    postgresql,
-    oracle,
-    sqlite,
-    mssql,
-)
-from sqlalchemy import util
-import datetime
-import collections
-from sqlalchemy import text, literal_column
-from sqlalchemy import and_, not_, between, or_
+from sqlalchemy.sql import desc
+from sqlalchemy.sql import false
+from sqlalchemy.sql import literal
+from sqlalchemy.sql import null
+from sqlalchemy.sql import operators
+from sqlalchemy.sql import sqltypes
+from sqlalchemy.sql import table
+from sqlalchemy.sql import true
+from sqlalchemy.sql.elements import _literal_as_text
+from sqlalchemy.sql.elements import Label
+from sqlalchemy.sql.expression import BinaryExpression
+from sqlalchemy.sql.expression import ClauseList
+from sqlalchemy.sql.expression import func
+from sqlalchemy.sql.expression import Grouping
+from sqlalchemy.sql.expression import select
+from sqlalchemy.sql.expression import tuple_
+from sqlalchemy.sql.expression import UnaryExpression
+from sqlalchemy.sql.expression import union
+from sqlalchemy.testing import assert_raises_message
+from sqlalchemy.testing import eq_
+from sqlalchemy.testing import expect_warnings
+from sqlalchemy.testing import fixtures
+from sqlalchemy.testing import is_
+from sqlalchemy.testing import is_not_
+from sqlalchemy.types import ARRAY
+from sqlalchemy.types import Boolean
+from sqlalchemy.types import Concatenable
+from sqlalchemy.types import DateTime
+from sqlalchemy.types import Indexable
+from sqlalchemy.types import JSON
+from sqlalchemy.types import MatchType
+from sqlalchemy.types import TypeDecorator
+from sqlalchemy.types import TypeEngine
+from sqlalchemy.types import UserDefinedType
 
 
 class LoopOperate(operators.ColumnOperators):
@@ -604,10 +609,10 @@ class ExtensionOperatorTest(fixtures.TestBase, testing.AssertsCompiledSQL):
 class JSONIndexOpTest(fixtures.TestBase, testing.AssertsCompiledSQL):
     def setUp(self):
         class MyTypeCompiler(compiler.GenericTypeCompiler):
-            def visit_mytype(self, type, **kw):
+            def visit_mytype(self, type_, **kw):
                 return "MYTYPE"
 
-            def visit_myothertype(self, type, **kw):
+            def visit_myothertype(self, type_, **kw):
                 return "MYOTHERTYPE"
 
         class MyCompiler(compiler.SQLCompiler):
@@ -721,10 +726,10 @@ class JSONIndexOpTest(fixtures.TestBase, testing.AssertsCompiledSQL):
 class ArrayIndexOpTest(fixtures.TestBase, testing.AssertsCompiledSQL):
     def setUp(self):
         class MyTypeCompiler(compiler.GenericTypeCompiler):
-            def visit_mytype(self, type, **kw):
+            def visit_mytype(self, type_, **kw):
                 return "MYTYPE"
 
-            def visit_myothertype(self, type, **kw):
+            def visit_myothertype(self, type_, **kw):
                 return "MYOTHERTYPE"
 
         class MyCompiler(compiler.SQLCompiler):