diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2019-01-06 01:19:47 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2019-01-06 18:23:11 -0500 |
| commit | 1e278de4cc9a4181e0747640a960e80efcea1ca9 (patch) | |
| tree | 13d0c035807613bfa07e734acad79b9c843cb8b0 /test/engine | |
| parent | 1e1a38e7801f410f244e4bbb44ec795ae152e04e (diff) | |
| download | sqlalchemy-1e278de4cc9a4181e0747640a960e80efcea1ca9.tar.gz | |
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
Diffstat (limited to 'test/engine')
| -rw-r--r-- | test/engine/test_bind.py | 16 | ||||
| -rw-r--r-- | test/engine/test_ddlevents.py | 37 | ||||
| -rw-r--r-- | test/engine/test_execute.py | 75 | ||||
| -rw-r--r-- | test/engine/test_logging.py | 11 | ||||
| -rw-r--r-- | test/engine/test_parseconnect.py | 24 | ||||
| -rw-r--r-- | test/engine/test_pool.py | 29 | ||||
| -rw-r--r-- | test/engine/test_processors.py | 3 | ||||
| -rw-r--r-- | test/engine/test_reconnect.py | 44 | ||||
| -rw-r--r-- | test/engine/test_reflection.py | 60 | ||||
| -rw-r--r-- | test/engine/test_transaction.py | 43 |
10 files changed, 187 insertions, 155 deletions
diff --git a/test/engine/test_bind.py b/test/engine/test_bind.py index 862626c40..98d53ee6d 100644 --- a/test/engine/test_bind.py +++ b/test/engine/test_bind.py @@ -1,15 +1,19 @@ """tests the "bind" attribute/argument across schema and SQL, including the deprecated versions of these arguments""" -from sqlalchemy.testing import assert_raises, assert_raises_message -from sqlalchemy import engine, exc -from sqlalchemy import MetaData, ThreadLocalMetaData -from sqlalchemy import Integer, text -from sqlalchemy.testing.schema import Table -from sqlalchemy.testing.schema import Column import sqlalchemy as sa +from sqlalchemy import engine +from sqlalchemy import exc +from sqlalchemy import Integer +from sqlalchemy import MetaData from sqlalchemy import testing +from sqlalchemy import text +from sqlalchemy import ThreadLocalMetaData +from sqlalchemy.testing import assert_raises +from sqlalchemy.testing import assert_raises_message from sqlalchemy.testing import fixtures +from sqlalchemy.testing.schema import Column +from sqlalchemy.testing.schema import Table class BindTest(fixtures.TestBase): diff --git a/test/engine/test_ddlevents.py b/test/engine/test_ddlevents.py index 307cb1cf1..562ed4d68 100644 --- a/test/engine/test_ddlevents.py +++ b/test/engine/test_ddlevents.py @@ -1,20 +1,24 @@ -from sqlalchemy.testing import assert_raises, assert_raises_message -from sqlalchemy.schema import ( - DDL, - CheckConstraint, - AddConstraint, - DropConstraint, -) -from sqlalchemy import create_engine -from sqlalchemy import MetaData, Integer, String, event, exc, text -from sqlalchemy.testing.schema import Table -from sqlalchemy.testing.schema import Column import sqlalchemy as tsa +from sqlalchemy import create_engine +from sqlalchemy import event +from sqlalchemy import exc +from sqlalchemy import Integer +from sqlalchemy import MetaData +from sqlalchemy import String from sqlalchemy import testing +from sqlalchemy import text +from sqlalchemy.schema import AddConstraint +from sqlalchemy.schema import CheckConstraint +from sqlalchemy.schema import DDL +from sqlalchemy.schema import DropConstraint +from sqlalchemy.testing import assert_raises +from sqlalchemy.testing import AssertsCompiledSQL from sqlalchemy.testing import engines -from sqlalchemy.testing import AssertsCompiledSQL, eq_ +from sqlalchemy.testing import eq_ from sqlalchemy.testing import fixtures from sqlalchemy.testing import mock +from sqlalchemy.testing.schema import Column +from sqlalchemy.testing.schema import Table class DDLEventTest(fixtures.TestBase): @@ -704,9 +708,12 @@ class DDLTest(fixtures.TestBase, AssertsCompiledSQL): engine = create_engine( testing.db.name + "://", strategy="mock", executor=executor ) - engine.dialect.identifier_preparer = tsa.sql.compiler.IdentifierPreparer( - engine.dialect - ) + # fmt: off + engine.dialect.identifier_preparer = \ + tsa.sql.compiler.IdentifierPreparer( + engine.dialect + ) + # fmt: on return engine def test_tokens(self): diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py index 87bf52bdb..d9d10a9a6 100644 --- a/test/engine/test_execute.py +++ b/test/engine/test_execute.py @@ -1,51 +1,50 @@ # coding: utf-8 -import weakref -from sqlalchemy.testing import ( - eq_, - assert_raises, - assert_raises_message, - config, - is_, - is_not_, - le_, - expect_warnings, -) +from contextlib import contextmanager import re -from sqlalchemy.testing.util import picklers -from sqlalchemy.testing.util import gc_collect -from sqlalchemy.interfaces import ConnectionProxy -from sqlalchemy import ( - MetaData, - Integer, - String, - INT, - VARCHAR, - func, - bindparam, - select, - event, - TypeDecorator, - create_engine, - Sequence, - LargeBinary, -) -from sqlalchemy.sql import column, literal -from sqlalchemy.testing.schema import Table, Column +import weakref + import sqlalchemy as tsa +from sqlalchemy import bindparam +from sqlalchemy import create_engine +from sqlalchemy import event +from sqlalchemy import func +from sqlalchemy import INT +from sqlalchemy import Integer +from sqlalchemy import LargeBinary +from sqlalchemy import MetaData +from sqlalchemy import select +from sqlalchemy import Sequence +from sqlalchemy import String from sqlalchemy import testing -from sqlalchemy.testing import engines +from sqlalchemy import TypeDecorator from sqlalchemy import util -from sqlalchemy.testing.engines import testing_engine -from sqlalchemy.dialects.oracle.zxjdbc import ReturningParam -from sqlalchemy.engine import result as _result, default +from sqlalchemy import VARCHAR +from sqlalchemy.engine import default from sqlalchemy.engine.base import Engine +from sqlalchemy.interfaces import ConnectionProxy +from sqlalchemy.sql import column +from sqlalchemy.sql import literal +from sqlalchemy.testing import assert_raises +from sqlalchemy.testing import assert_raises_message +from sqlalchemy.testing import config +from sqlalchemy.testing import engines +from sqlalchemy.testing import eq_ +from sqlalchemy.testing import expect_warnings from sqlalchemy.testing import fixtures -from sqlalchemy.testing.mock import Mock, call, patch +from sqlalchemy.testing import is_ +from sqlalchemy.testing import is_not_ from sqlalchemy.testing import mock -from contextlib import contextmanager -from sqlalchemy.util import nested from sqlalchemy.testing.assertsql import CompiledSQL +from sqlalchemy.testing.engines import testing_engine +from sqlalchemy.testing.mock import call +from sqlalchemy.testing.mock import Mock +from sqlalchemy.testing.mock import patch +from sqlalchemy.testing.schema import Column +from sqlalchemy.testing.schema import Table +from sqlalchemy.testing.util import gc_collect +from sqlalchemy.testing.util import picklers +from sqlalchemy.util import nested users, metadata, users_autoinc = None, None, None diff --git a/test/engine/test_logging.py b/test/engine/test_logging.py index 4a19ee86f..8190a3fcd 100644 --- a/test/engine/test_logging.py +++ b/test/engine/test_logging.py @@ -1,12 +1,15 @@ -from sqlalchemy.testing import eq_, assert_raises_message, eq_regex -from sqlalchemy import select +import logging.handlers + import sqlalchemy as tsa +from sqlalchemy import select +from sqlalchemy import util +from sqlalchemy.testing import assert_raises_message from sqlalchemy.testing import engines -import logging.handlers +from sqlalchemy.testing import eq_ +from sqlalchemy.testing import eq_regex from sqlalchemy.testing import fixtures from sqlalchemy.testing import mock from sqlalchemy.testing.util import lazy_gc -from sqlalchemy import util class LogParamsTest(fixtures.TestBase): diff --git a/test/engine/test_parseconnect.py b/test/engine/test_parseconnect.py index 39ad7042b..7a8918817 100644 --- a/test/engine/test_parseconnect.py +++ b/test/engine/test_parseconnect.py @@ -1,14 +1,22 @@ -from sqlalchemy.testing import assert_raises, eq_, is_ -import sqlalchemy.engine.url as url -from sqlalchemy import create_engine, engine_from_config, exc, pool -from sqlalchemy.engine.default import DefaultDialect import sqlalchemy as tsa -from sqlalchemy.testing import fixtures +from sqlalchemy import create_engine +from sqlalchemy import engine_from_config +from sqlalchemy import exc +from sqlalchemy import pool from sqlalchemy import testing -from sqlalchemy.testing.mock import Mock, MagicMock, call -from sqlalchemy.testing import mock -from sqlalchemy.dialects import registry from sqlalchemy.dialects import plugins +from sqlalchemy.dialects import registry +from sqlalchemy.engine.default import DefaultDialect +import sqlalchemy.engine.url as url +from sqlalchemy.testing import assert_raises +from sqlalchemy.testing import eq_ +from sqlalchemy.testing import fixtures +from sqlalchemy.testing import is_ +from sqlalchemy.testing import mock +from sqlalchemy.testing.mock import call +from sqlalchemy.testing.mock import MagicMock +from sqlalchemy.testing.mock import Mock + dialect = None diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index 547c265bb..02eb5fc54 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -1,17 +1,28 @@ +import collections +import random import threading import time -from sqlalchemy import pool, select, event +import weakref + import sqlalchemy as tsa +from sqlalchemy import event +from sqlalchemy import pool +from sqlalchemy import select from sqlalchemy import testing -from sqlalchemy.testing.util import gc_collect, lazy_gc -from sqlalchemy.testing import eq_, assert_raises, is_not_, is_ -from sqlalchemy.testing.engines import testing_engine -from sqlalchemy.testing import fixtures +from sqlalchemy.testing import assert_raises from sqlalchemy.testing import assert_raises_message -import random -from sqlalchemy.testing.mock import Mock, call, patch, ANY -import weakref -import collections +from sqlalchemy.testing import eq_ +from sqlalchemy.testing import fixtures +from sqlalchemy.testing import is_ +from sqlalchemy.testing import is_not_ +from sqlalchemy.testing.engines import testing_engine +from sqlalchemy.testing.mock import ANY +from sqlalchemy.testing.mock import call +from sqlalchemy.testing.mock import Mock +from sqlalchemy.testing.mock import patch +from sqlalchemy.testing.util import gc_collect +from sqlalchemy.testing.util import lazy_gc + join_timeout = 10 diff --git a/test/engine/test_processors.py b/test/engine/test_processors.py index 8da838145..9bfd8d505 100644 --- a/test/engine/test_processors.py +++ b/test/engine/test_processors.py @@ -1,5 +1,6 @@ +from sqlalchemy.testing import assert_raises_message +from sqlalchemy.testing import eq_ from sqlalchemy.testing import fixtures -from sqlalchemy.testing import assert_raises_message, eq_ class _BooleanProcessorTest(fixtures.TestBase): diff --git a/test/engine/test_reconnect.py b/test/engine/test_reconnect.py index 1ba8bcac2..f6904174b 100644 --- a/test/engine/test_reconnect.py +++ b/test/engine/test_reconnect.py @@ -1,31 +1,31 @@ -from sqlalchemy.testing import ( - eq_, - ne_, - assert_raises, - expect_warnings, - assert_raises_message, -) import time -from sqlalchemy import ( - select, - MetaData, - Integer, - String, - create_engine, - pool, - exc, - util, -) -from sqlalchemy.testing.schema import Table, Column + import sqlalchemy as tsa -from sqlalchemy.engine import url +from sqlalchemy import create_engine +from sqlalchemy import event +from sqlalchemy import exc +from sqlalchemy import Integer +from sqlalchemy import MetaData +from sqlalchemy import pool +from sqlalchemy import select +from sqlalchemy import String from sqlalchemy import testing -from sqlalchemy.testing import mock +from sqlalchemy import util +from sqlalchemy.engine import url +from sqlalchemy.testing import assert_raises +from sqlalchemy.testing import assert_raises_message from sqlalchemy.testing import engines +from sqlalchemy.testing import eq_ +from sqlalchemy.testing import expect_warnings from sqlalchemy.testing import fixtures +from sqlalchemy.testing import mock +from sqlalchemy.testing import ne_ from sqlalchemy.testing.engines import testing_engine -from sqlalchemy.testing.mock import Mock, call, patch -from sqlalchemy import event +from sqlalchemy.testing.mock import call +from sqlalchemy.testing.mock import Mock +from sqlalchemy.testing.mock import patch +from sqlalchemy.testing.schema import Column +from sqlalchemy.testing.schema import Table from sqlalchemy.testing.util import gc_collect diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py index 29e090039..41f75b8f8 100644 --- a/test/engine/test_reflection.py +++ b/test/engine/test_reflection.py @@ -1,36 +1,35 @@ import unicodedata + import sqlalchemy as sa -from sqlalchemy import schema, inspect, sql -from sqlalchemy import ( - MetaData, - Integer, - String, - Index, - ForeignKey, - UniqueConstraint, - FetchedValue, - DefaultClause, -) -from sqlalchemy.testing import ( - ComparesTables, - engines, - AssertsCompiledSQL, - fixtures, - skip, -) -from sqlalchemy.testing.schema import Table, Column -from sqlalchemy.testing import ( - eq_, - eq_regex, - is_true, - assert_raises, - assert_raises_message, -) +from sqlalchemy import DefaultClause +from sqlalchemy import FetchedValue +from sqlalchemy import ForeignKey +from sqlalchemy import Index +from sqlalchemy import inspect +from sqlalchemy import Integer +from sqlalchemy import MetaData +from sqlalchemy import schema +from sqlalchemy import sql +from sqlalchemy import String from sqlalchemy import testing -from sqlalchemy.util import ue +from sqlalchemy import UniqueConstraint +from sqlalchemy.testing import assert_raises +from sqlalchemy.testing import assert_raises_message +from sqlalchemy.testing import AssertsCompiledSQL +from sqlalchemy.testing import ComparesTables from sqlalchemy.testing import config -from sqlalchemy.testing import mock +from sqlalchemy.testing import engines +from sqlalchemy.testing import eq_ +from sqlalchemy.testing import eq_regex from sqlalchemy.testing import expect_warnings +from sqlalchemy.testing import fixtures +from sqlalchemy.testing import is_true +from sqlalchemy.testing import mock +from sqlalchemy.testing import skip +from sqlalchemy.testing.schema import Column +from sqlalchemy.testing.schema import Table +from sqlalchemy.util import ue + metadata, users = None, None @@ -284,7 +283,10 @@ class ReflectionTest(fixtures.TestBase, ComparesTables): 1, ) if ( - testing.requires.unique_constraint_reflection_no_index_overlap.enabled + # fmt: off + testing.requires. + unique_constraint_reflection_no_index_overlap.enabled + # fmt: on ): eq_( len( diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py index ad2f29fa0..136468329 100644 --- a/test/engine/test_transaction.py +++ b/test/engine/test_transaction.py @@ -1,30 +1,27 @@ -from sqlalchemy.testing import ( - eq_, - assert_raises, - assert_raises_message, - ne_, - expect_warnings, -) import sys + +from sqlalchemy import create_engine from sqlalchemy import event -from sqlalchemy.testing.engines import testing_engine -from sqlalchemy import ( - create_engine, - MetaData, - INT, - VARCHAR, - Sequence, - select, - Integer, - String, - func, - text, - exc, -) -from sqlalchemy.testing.schema import Table -from sqlalchemy.testing.schema import Column +from sqlalchemy import exc +from sqlalchemy import func +from sqlalchemy import INT +from sqlalchemy import Integer +from sqlalchemy import MetaData +from sqlalchemy import select +from sqlalchemy import Sequence +from sqlalchemy import String from sqlalchemy import testing +from sqlalchemy import text +from sqlalchemy import VARCHAR +from sqlalchemy.testing import assert_raises +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 ne_ +from sqlalchemy.testing.engines import testing_engine +from sqlalchemy.testing.schema import Column +from sqlalchemy.testing.schema import Table users, metadata = None, None |
