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 /lib/sqlalchemy/testing/suite | |
| 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 'lib/sqlalchemy/testing/suite')
| -rw-r--r-- | lib/sqlalchemy/testing/suite/__init__.py | 20 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_cte.py | 16 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_ddl.py | 12 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_dialect.py | 17 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_insert.py | 19 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_reflection.py | 43 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_results.py | 23 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_select.py | 31 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_sequence.py | 16 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_types.py | 59 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_update_delete.py | 10 |
11 files changed, 159 insertions, 107 deletions
diff --git a/lib/sqlalchemy/testing/suite/__init__.py b/lib/sqlalchemy/testing/suite/__init__.py index a4e142c5a..465a6cfc5 100644 --- a/lib/sqlalchemy/testing/suite/__init__.py +++ b/lib/sqlalchemy/testing/suite/__init__.py @@ -1,10 +1,10 @@ -from sqlalchemy.testing.suite.test_cte import * -from sqlalchemy.testing.suite.test_dialect import * -from sqlalchemy.testing.suite.test_ddl import * -from sqlalchemy.testing.suite.test_insert import * -from sqlalchemy.testing.suite.test_sequence import * -from sqlalchemy.testing.suite.test_select import * -from sqlalchemy.testing.suite.test_results import * -from sqlalchemy.testing.suite.test_update_delete import * -from sqlalchemy.testing.suite.test_reflection import * -from sqlalchemy.testing.suite.test_types import * +from .test_cte import * # noqa +from .test_ddl import * # noqa +from .test_dialect import * # noqa +from .test_insert import * # noqa +from .test_reflection import * # noqa +from .test_results import * # noqa +from .test_select import * # noqa +from .test_sequence import * # noqa +from .test_types import * # noqa +from .test_update_delete import * # noqa diff --git a/lib/sqlalchemy/testing/suite/test_cte.py b/lib/sqlalchemy/testing/suite/test_cte.py index d2f35933b..012de7911 100644 --- a/lib/sqlalchemy/testing/suite/test_cte.py +++ b/lib/sqlalchemy/testing/suite/test_cte.py @@ -1,11 +1,13 @@ -from .. import fixtures, config +from .. import config +from .. import fixtures from ..assertions import eq_ - -from sqlalchemy import Integer, String, select -from sqlalchemy import ForeignKey -from sqlalchemy import testing - -from ..schema import Table, Column +from ..schema import Column +from ..schema import Table +from ... import ForeignKey +from ... import Integer +from ... import select +from ... import String +from ... import testing class CTETest(fixtures.TablesTest): diff --git a/lib/sqlalchemy/testing/suite/test_ddl.py b/lib/sqlalchemy/testing/suite/test_ddl.py index 7c44388d4..8317590c8 100644 --- a/lib/sqlalchemy/testing/suite/test_ddl.py +++ b/lib/sqlalchemy/testing/suite/test_ddl.py @@ -1,8 +1,12 @@ -from .. import fixtures, config, util -from ..config import requirements +from .. import config +from .. import fixtures +from .. import util from ..assertions import eq_ - -from sqlalchemy import Table, Column, Integer, String +from ..config import requirements +from ... import Column +from ... import Integer +from ... import String +from ... import Table class TableDDLTest(fixtures.TestBase): diff --git a/lib/sqlalchemy/testing/suite/test_dialect.py b/lib/sqlalchemy/testing/suite/test_dialect.py index 5e589f3b8..245ccc6f0 100644 --- a/lib/sqlalchemy/testing/suite/test_dialect.py +++ b/lib/sqlalchemy/testing/suite/test_dialect.py @@ -1,11 +1,16 @@ -from .. import fixtures, config -from ..config import requirements -from sqlalchemy import exc -from sqlalchemy import Integer, String, select, literal_column from .. import assert_raises -from ..schema import Table, Column -from .. import provide_metadata +from .. import config from .. import eq_ +from .. import fixtures +from .. import provide_metadata +from ..config import requirements +from ..schema import Column +from ..schema import Table +from ... import exc +from ... import Integer +from ... import literal_column +from ... import select +from ... import String class ExceptionTest(fixtures.TablesTest): diff --git a/lib/sqlalchemy/testing/suite/test_insert.py b/lib/sqlalchemy/testing/suite/test_insert.py index 6257451eb..1b14e8ed8 100644 --- a/lib/sqlalchemy/testing/suite/test_insert.py +++ b/lib/sqlalchemy/testing/suite/test_insert.py @@ -1,12 +1,15 @@ -from .. import fixtures, config -from ..config import requirements -from .. import exclusions -from ..assertions import eq_ +from .. import config from .. import engines - -from sqlalchemy import Integer, String, select, literal_column, literal - -from ..schema import Table, Column +from .. import fixtures +from ..assertions import eq_ +from ..config import requirements +from ..schema import Column +from ..schema import Table +from ... import Integer +from ... import literal +from ... import literal_column +from ... import select +from ... import String class LastrowidTest(fixtures.TablesTest): diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py index bfed5f1ab..96bd188ee 100644 --- a/lib/sqlalchemy/testing/suite/test_reflection.py +++ b/lib/sqlalchemy/testing/suite/test_reflection.py @@ -1,21 +1,30 @@ -import sqlalchemy as sa -from sqlalchemy import exc as sa_exc -from sqlalchemy import types as sql_types -from sqlalchemy import inspect -from sqlalchemy import MetaData, Integer, String, func -from sqlalchemy.engine.reflection import Inspector -from sqlalchemy.testing import engines, fixtures -from sqlalchemy.testing.schema import Table, Column -from sqlalchemy.testing import eq_, is_, assert_raises_message -from sqlalchemy import testing -from .. import config import operator -from sqlalchemy.schema import DDL, Index -from sqlalchemy import event -from sqlalchemy.sql.elements import quoted_name -from sqlalchemy import ForeignKey import re +import sqlalchemy as sa +from .. import assert_raises_message +from .. import config +from .. import engines +from .. import eq_ +from .. import fixtures +from .. import is_ +from ..schema import Column +from ..schema import Table +from ... import event +from ... import exc as sa_exc +from ... import ForeignKey +from ... import inspect +from ... import Integer +from ... import MetaData +from ... import String +from ... import testing +from ... import types as sql_types +from ...engine.reflection import Inspector +from ...schema import DDL +from ...schema import Index +from ...sql.elements import quoted_name + + metadata, users = None, None @@ -367,7 +376,9 @@ class ComponentReflectionTest(fixtures.TablesTest): {"comment": "id comment", "name": "id"}, {"comment": "data % comment", "name": "data"}, { - "comment": r"""Comment types type speedily ' " \ '' Fun!""", + "comment": ( + r"""Comment types type speedily ' " \ '' Fun!""" + ), "name": "d2", }, ], diff --git a/lib/sqlalchemy/testing/suite/test_results.py b/lib/sqlalchemy/testing/suite/test_results.py index 247f05cf5..aa98a5088 100644 --- a/lib/sqlalchemy/testing/suite/test_results.py +++ b/lib/sqlalchemy/testing/suite/test_results.py @@ -1,13 +1,20 @@ -from .. import fixtures, config -from ..config import requirements -from .. import exclusions -from ..assertions import eq_ +import datetime + +from .. import config from .. import engines +from .. import fixtures +from ..assertions import eq_ +from ..config import requirements +from ..schema import Column +from ..schema import Table +from ... import DateTime +from ... import func +from ... import Integer +from ... import select +from ... import sql +from ... import String from ... import testing - -from sqlalchemy import Integer, String, select, util, sql, DateTime, text, func -import datetime -from ..schema import Table, Column +from ... import text class RowFetchTest(fixtures.TablesTest): diff --git a/lib/sqlalchemy/testing/suite/test_select.py b/lib/sqlalchemy/testing/suite/test_select.py index 032b68eb6..d26585141 100644 --- a/lib/sqlalchemy/testing/suite/test_select.py +++ b/lib/sqlalchemy/testing/suite/test_select.py @@ -1,14 +1,23 @@ -from sqlalchemy.dialects.mssql.base import MSDialect -from sqlalchemy.dialects.oracle.base import OracleDialect -from .. import fixtures, config -from ..assertions import eq_, in_ - -from sqlalchemy import util, case, null, true, false, or_ -from sqlalchemy import Integer, String, select, func, bindparam, union, tuple_ -from sqlalchemy import testing -from sqlalchemy import literal_column - -from ..schema import Table, Column +from .. import config +from .. import fixtures +from ..assertions import eq_ +from ..assertions import in_ +from ..schema import Column +from ..schema import Table +from ... import bindparam +from ... import case +from ... import false +from ... import func +from ... import Integer +from ... import literal_column +from ... import null +from ... import select +from ... import String +from ... import testing +from ... import true +from ... import tuple_ +from ... import union +from ... import util class CollateTest(fixtures.TablesTest): diff --git a/lib/sqlalchemy/testing/suite/test_sequence.py b/lib/sqlalchemy/testing/suite/test_sequence.py index 15a850fe9..22ae7d43c 100644 --- a/lib/sqlalchemy/testing/suite/test_sequence.py +++ b/lib/sqlalchemy/testing/suite/test_sequence.py @@ -1,12 +1,16 @@ -from .. import fixtures, config -from ..config import requirements +from .. import config +from .. import fixtures from ..assertions import eq_ +from ..config import requirements +from ..schema import Column +from ..schema import Table +from ... import Integer +from ... import MetaData +from ... import schema +from ... import Sequence +from ... import String from ... import testing -from ... import Integer, String, Sequence, schema, MetaData - -from ..schema import Table, Column - class SequenceTest(fixtures.TablesTest): __requires__ = ("sequences",) diff --git a/lib/sqlalchemy/testing/suite/test_types.py b/lib/sqlalchemy/testing/suite/test_types.py index 6dfb80915..ff8db5897 100644 --- a/lib/sqlalchemy/testing/suite/test_types.py +++ b/lib/sqlalchemy/testing/suite/test_types.py @@ -1,33 +1,40 @@ # coding: utf-8 -from .. import fixtures, config +import datetime +import decimal + +from .. import config +from .. import fixtures from ..assertions import eq_ from ..config import requirements -from sqlalchemy import Integer, Unicode, UnicodeText, select, TIMESTAMP -from sqlalchemy import ( - Date, - DateTime, - Time, - MetaData, - String, - Text, - Numeric, - Float, - literal, - Boolean, - cast, - null, - JSON, - and_, - type_coerce, - BigInteger, -) -from ..schema import Table, Column +from ..schema import Column +from ..schema import Table +from ... import and_ +from ... import BigInteger +from ... import Boolean +from ... import cast +from ... import Date +from ... import DateTime +from ... import Float +from ... import Integer +from ... import JSON +from ... import literal +from ... import MetaData +from ... import null +from ... import Numeric +from ... import select +from ... import String from ... import testing -import decimal -import datetime -from ...util import u +from ... import Text +from ... import Time +from ... import TIMESTAMP +from ... import type_coerce +from ... import Unicode +from ... import UnicodeText from ... import util +from ...ext.declarative import declarative_base +from ...orm import Session +from ...util import u class _LiteralRoundTripFixture(object): @@ -341,7 +348,7 @@ class IntegerTest(_LiteralRoundTripFixture, fixtures.TestBase): if util.py3k: assert isinstance(row[0], int) else: - assert isinstance(row[0], (long, int)) + assert isinstance(row[0], (long, int)) # noqa class NumericTest(_LiteralRoundTripFixture, fixtures.TestBase): @@ -872,8 +879,6 @@ class JSONTest(_LiteralRoundTripFixture, fixtures.TablesTest): ) def test_eval_none_flag_orm(self): - from sqlalchemy.ext.declarative import declarative_base - from sqlalchemy.orm import Session Base = declarative_base() diff --git a/lib/sqlalchemy/testing/suite/test_update_delete.py b/lib/sqlalchemy/testing/suite/test_update_delete.py index b232c3a78..97bdf0ad7 100644 --- a/lib/sqlalchemy/testing/suite/test_update_delete.py +++ b/lib/sqlalchemy/testing/suite/test_update_delete.py @@ -1,8 +1,10 @@ -from .. import fixtures, config +from .. import config +from .. import fixtures from ..assertions import eq_ - -from sqlalchemy import Integer, String -from ..schema import Table, Column +from ..schema import Column +from ..schema import Table +from ... import Integer +from ... import String class SimpleUpdateDeleteTest(fixtures.TablesTest): |
