From 8ac1578f3b83ce012651682354c03ebbf8cc6e88 Mon Sep 17 00:00:00 2001 From: mwoss Date: Fri, 26 Oct 2018 21:57:02 +0200 Subject: [PATCH] Fix import format at pandas/tests/io/parser directory --- pandas/tests/io/parser/c_parser_only.py | 6 ++--- pandas/tests/io/parser/comment.py | 2 +- pandas/tests/io/parser/common.py | 15 +++++------ pandas/tests/io/parser/compression.py | 7 ++--- pandas/tests/io/parser/converters.py | 7 +++-- pandas/tests/io/parser/dialect.py | 3 +-- pandas/tests/io/parser/dtypes.py | 5 ++-- pandas/tests/io/parser/header.py | 3 +-- pandas/tests/io/parser/index_col.py | 1 - pandas/tests/io/parser/mangle_dupes.py | 5 ++-- pandas/tests/io/parser/multithread.py | 3 ++- pandas/tests/io/parser/na_values.py | 3 +-- pandas/tests/io/parser/parse_dates.py | 18 ++++++------- pandas/tests/io/parser/python_parser_only.py | 6 ++--- pandas/tests/io/parser/quoting.py | 4 +-- pandas/tests/io/parser/skiprows.py | 3 +-- pandas/tests/io/parser/test_network.py | 6 ++--- pandas/tests/io/parser/test_parsers.py | 27 ++++++++++---------- pandas/tests/io/parser/test_read_fwf.py | 11 ++++---- pandas/tests/io/parser/test_textreader.py | 19 +++++--------- pandas/tests/io/parser/test_unsupported.py | 5 ++-- pandas/tests/io/parser/usecols.py | 3 +-- setup.cfg | 22 ---------------- 23 files changed, 72 insertions(+), 112 deletions(-) diff --git a/pandas/tests/io/parser/c_parser_only.py b/pandas/tests/io/parser/c_parser_only.py index 9dc7b070f889d..7769b62dc0206 100644 --- a/pandas/tests/io/parser/c_parser_only.py +++ b/pandas/tests/io/parser/c_parser_only.py @@ -11,14 +11,14 @@ import sys import tarfile -import pytest import numpy as np +import pytest import pandas as pd -import pandas.util.testing as tm import pandas.util._test_decorators as td +import pandas.util.testing as tm from pandas import DataFrame -from pandas.compat import StringIO, range, lrange +from pandas.compat import StringIO, lrange, range class CParserTests(object): diff --git a/pandas/tests/io/parser/comment.py b/pandas/tests/io/parser/comment.py index 9987a017cf985..c71f92d8fb1be 100644 --- a/pandas/tests/io/parser/comment.py +++ b/pandas/tests/io/parser/comment.py @@ -6,8 +6,8 @@ """ import numpy as np -import pandas.util.testing as tm +import pandas.util.testing as tm from pandas import DataFrame from pandas.compat import StringIO diff --git a/pandas/tests/io/parser/common.py b/pandas/tests/io/parser/common.py index 49e42786d6fb8..82557815ed5cf 100644 --- a/pandas/tests/io/parser/common.py +++ b/pandas/tests/io/parser/common.py @@ -1,26 +1,23 @@ # -*- coding: utf-8 -*- +import codecs import csv import os import platform -import codecs - import re import sys -from datetime import datetime from collections import OrderedDict +from datetime import datetime from io import TextIOWrapper -import pytest import numpy as np -from pandas._libs.tslib import Timestamp +import pytest import pandas as pd import pandas.util.testing as tm -from pandas import DataFrame, Series, Index, MultiIndex -from pandas import compat -from pandas.compat import (StringIO, BytesIO, PY3, - range, lrange, u) +from pandas import DataFrame, Index, MultiIndex, Series, compat +from pandas._libs.tslib import Timestamp +from pandas.compat import PY3, BytesIO, StringIO, lrange, range, u from pandas.errors import DtypeWarning, EmptyDataError, ParserError from pandas.io.common import URLError from pandas.io.parsers import TextFileReader, TextParser diff --git a/pandas/tests/io/parser/compression.py b/pandas/tests/io/parser/compression.py index 5a28b6263f20f..5efed89663e0f 100644 --- a/pandas/tests/io/parser/compression.py +++ b/pandas/tests/io/parser/compression.py @@ -5,15 +5,16 @@ of the parsers defined in parsers.py """ +import bz2 +import gzip + import pytest import pandas as pd import pandas.compat as compat -import pandas.util.testing as tm import pandas.util._test_decorators as td +import pandas.util.testing as tm -import gzip -import bz2 try: lzma = compat.import_lzma() except ImportError: diff --git a/pandas/tests/io/parser/converters.py b/pandas/tests/io/parser/converters.py index ae35d45591dc5..be14e7be0ab9b 100644 --- a/pandas/tests/io/parser/converters.py +++ b/pandas/tests/io/parser/converters.py @@ -7,15 +7,14 @@ from datetime import datetime +import numpy as np import pytest -import numpy as np import pandas as pd import pandas.util.testing as tm - -from pandas._libs.tslib import Timestamp from pandas import DataFrame, Index -from pandas.compat import parse_date, StringIO, lmap +from pandas._libs.tslib import Timestamp +from pandas.compat import StringIO, lmap, parse_date class ConverterTests(object): diff --git a/pandas/tests/io/parser/dialect.py b/pandas/tests/io/parser/dialect.py index f756fe71bf684..2a519a0083f40 100644 --- a/pandas/tests/io/parser/dialect.py +++ b/pandas/tests/io/parser/dialect.py @@ -7,12 +7,11 @@ import csv +import pandas.util.testing as tm from pandas import DataFrame from pandas.compat import StringIO from pandas.errors import ParserWarning -import pandas.util.testing as tm - class DialectTests(object): diff --git a/pandas/tests/io/parser/dtypes.py b/pandas/tests/io/parser/dtypes.py index 8060ebf2fbcd4..00dfb616c18ca 100644 --- a/pandas/tests/io/parser/dtypes.py +++ b/pandas/tests/io/parser/dtypes.py @@ -5,13 +5,12 @@ for all of the parsers defined in parsers.py """ +import numpy as np import pytest -import numpy as np import pandas as pd import pandas.util.testing as tm - -from pandas import DataFrame, Series, Index, MultiIndex, Categorical +from pandas import Categorical, DataFrame, Index, MultiIndex, Series from pandas.compat import StringIO from pandas.core.dtypes.dtypes import CategoricalDtype from pandas.errors import ParserWarning diff --git a/pandas/tests/io/parser/header.py b/pandas/tests/io/parser/header.py index ad3d4592bd599..ced59fe1696d6 100644 --- a/pandas/tests/io/parser/header.py +++ b/pandas/tests/io/parser/header.py @@ -7,11 +7,10 @@ from collections import namedtuple +import numpy as np import pytest -import numpy as np import pandas.util.testing as tm - from pandas import DataFrame, Index, MultiIndex from pandas.compat import StringIO, lrange, u diff --git a/pandas/tests/io/parser/index_col.py b/pandas/tests/io/parser/index_col.py index ee9b210443636..973fa4c57545a 100644 --- a/pandas/tests/io/parser/index_col.py +++ b/pandas/tests/io/parser/index_col.py @@ -9,7 +9,6 @@ import pytest import pandas.util.testing as tm - from pandas import DataFrame, Index, MultiIndex from pandas.compat import StringIO diff --git a/pandas/tests/io/parser/mangle_dupes.py b/pandas/tests/io/parser/mangle_dupes.py index 6df69eb475bf7..d043f64460028 100644 --- a/pandas/tests/io/parser/mangle_dupes.py +++ b/pandas/tests/io/parser/mangle_dupes.py @@ -6,10 +6,9 @@ de-duplicated (if mangling requested) or ignored otherwise. """ -from pandas.compat import StringIO -from pandas import DataFrame - import pandas.util.testing as tm +from pandas import DataFrame +from pandas.compat import StringIO class DupeColumnTests(object): diff --git a/pandas/tests/io/parser/multithread.py b/pandas/tests/io/parser/multithread.py index 2aaef889db6de..dee7067ea8728 100644 --- a/pandas/tests/io/parser/multithread.py +++ b/pandas/tests/io/parser/multithread.py @@ -6,12 +6,13 @@ """ from __future__ import division + from multiprocessing.pool import ThreadPool import numpy as np + import pandas as pd import pandas.util.testing as tm - from pandas import DataFrame from pandas.compat import BytesIO, range diff --git a/pandas/tests/io/parser/na_values.py b/pandas/tests/io/parser/na_values.py index 29aed63e657fb..392f4de2ecaaf 100644 --- a/pandas/tests/io/parser/na_values.py +++ b/pandas/tests/io/parser/na_values.py @@ -5,13 +5,12 @@ parsing for all of the parsers defined in parsers.py """ -import pytest import numpy as np +import pytest from numpy import nan import pandas.io.common as com import pandas.util.testing as tm - from pandas import DataFrame, Index, MultiIndex from pandas.compat import StringIO, range diff --git a/pandas/tests/io/parser/parse_dates.py b/pandas/tests/io/parser/parse_dates.py index ae3c806ac1c8e..d893b91226976 100644 --- a/pandas/tests/io/parser/parse_dates.py +++ b/pandas/tests/io/parser/parse_dates.py @@ -5,23 +5,21 @@ parsers defined in parsers.py """ +from datetime import date, datetime from distutils.version import LooseVersion -from datetime import datetime, date -import pytest import numpy as np -from pandas._libs.tslibs import parsing -from pandas._libs.tslib import Timestamp - +import pytest import pytz + import pandas as pd +import pandas.io.date_converters as conv import pandas.io.parsers as parsers import pandas.util.testing as tm - -import pandas.io.date_converters as conv -from pandas import DataFrame, Series, Index, DatetimeIndex, MultiIndex -from pandas import compat -from pandas.compat import parse_date, StringIO, lrange +from pandas import DataFrame, DatetimeIndex, Index, MultiIndex, Series, compat +from pandas._libs.tslib import Timestamp +from pandas._libs.tslibs import parsing +from pandas.compat import StringIO, lrange, parse_date from pandas.compat.numpy import np_array_datetime64_compat from pandas.core.indexes.datetimes import date_range diff --git a/pandas/tests/io/parser/python_parser_only.py b/pandas/tests/io/parser/python_parser_only.py index c0616ebbab4a5..5d2f6b7231a5d 100644 --- a/pandas/tests/io/parser/python_parser_only.py +++ b/pandas/tests/io/parser/python_parser_only.py @@ -8,13 +8,13 @@ """ import csv + import pytest import pandas.util.testing as tm -from pandas import DataFrame, Index -from pandas import compat +from pandas import DataFrame, Index, compat +from pandas.compat import BytesIO, StringIO, u from pandas.errors import ParserError -from pandas.compat import StringIO, BytesIO, u class PythonParserTests(object): diff --git a/pandas/tests/io/parser/quoting.py b/pandas/tests/io/parser/quoting.py index 013e635f80d21..27ee824cd2556 100644 --- a/pandas/tests/io/parser/quoting.py +++ b/pandas/tests/io/parser/quoting.py @@ -6,11 +6,11 @@ """ import csv -import pandas.util.testing as tm +import pandas.util.testing as tm from pandas import DataFrame -from pandas.errors import ParserError from pandas.compat import PY3, StringIO, u +from pandas.errors import ParserError class QuotingTests(object): diff --git a/pandas/tests/io/parser/skiprows.py b/pandas/tests/io/parser/skiprows.py index fb08ec0447267..89a7b5fd0ea1f 100644 --- a/pandas/tests/io/parser/skiprows.py +++ b/pandas/tests/io/parser/skiprows.py @@ -10,10 +10,9 @@ import numpy as np import pandas.util.testing as tm - from pandas import DataFrame +from pandas.compat import StringIO, lrange, range from pandas.errors import EmptyDataError -from pandas.compat import StringIO, range, lrange class SkipRowsTests(object): diff --git a/pandas/tests/io/parser/test_network.py b/pandas/tests/io/parser/test_network.py index bfe33980ac617..8b8bf3a339d85 100644 --- a/pandas/tests/io/parser/test_network.py +++ b/pandas/tests/io/parser/test_network.py @@ -6,14 +6,14 @@ """ import logging -import pytest import numpy as np +import pytest -import pandas.util.testing as tm import pandas.util._test_decorators as td +import pandas.util.testing as tm from pandas import DataFrame -from pandas.io.parsers import read_csv from pandas.compat import BytesIO, StringIO +from pandas.io.parsers import read_csv @pytest.mark.network diff --git a/pandas/tests/io/parser/test_parsers.py b/pandas/tests/io/parser/test_parsers.py index 8535a51657abf..00879c096aa50 100644 --- a/pandas/tests/io/parser/test_parsers.py +++ b/pandas/tests/io/parser/test_parsers.py @@ -1,31 +1,32 @@ # -*- coding: utf-8 -*- import os + import pytest -import pandas.util.testing as tm -from pandas import read_csv, read_table, DataFrame import pandas.core.common as com +import pandas.util.testing as tm +from pandas import DataFrame, read_csv, read_table from pandas._libs.tslib import Timestamp from pandas.compat import StringIO -from .common import ParserTests -from .header import HeaderTests +from .c_parser_only import CParserTests from .comment import CommentTests +from .common import ParserTests +from .compression import CompressionTests +from .converters import ConverterTests from .dialect import DialectTests -from .quoting import QuotingTests -from .usecols import UsecolsTests -from .skiprows import SkipRowsTests +from .dtypes import DtypeTests +from .header import HeaderTests from .index_col import IndexColTests -from .na_values import NAvaluesTests -from .converters import ConverterTests -from .c_parser_only import CParserTests -from .parse_dates import ParseDatesTests -from .compression import CompressionTests from .mangle_dupes import DupeColumnTests from .multithread import MultithreadTests +from .na_values import NAvaluesTests +from .parse_dates import ParseDatesTests from .python_parser_only import PythonParserTests -from .dtypes import DtypeTests +from .quoting import QuotingTests +from .skiprows import SkipRowsTests +from .usecols import UsecolsTests class BaseParser(CommentTests, CompressionTests, diff --git a/pandas/tests/io/parser/test_read_fwf.py b/pandas/tests/io/parser/test_read_fwf.py index a60f2b5a4c946..468640ae327bb 100644 --- a/pandas/tests/io/parser/test_read_fwf.py +++ b/pandas/tests/io/parser/test_read_fwf.py @@ -8,15 +8,14 @@ from datetime import datetime -import pytest import numpy as np +import pytest + import pandas as pd import pandas.util.testing as tm - -from pandas import DataFrame -from pandas import compat -from pandas.compat import StringIO, BytesIO -from pandas.io.parsers import read_csv, read_fwf, EmptyDataError +from pandas import DataFrame, compat +from pandas.compat import BytesIO, StringIO +from pandas.io.parsers import EmptyDataError, read_csv, read_fwf class TestFwfParsing(object): diff --git a/pandas/tests/io/parser/test_textreader.py b/pandas/tests/io/parser/test_textreader.py index c7026e3e0fc88..94c69bbbb8d5f 100644 --- a/pandas/tests/io/parser/test_textreader.py +++ b/pandas/tests/io/parser/test_textreader.py @@ -5,25 +5,20 @@ is integral to the C engine in parsers.py """ -import pytest - -from pandas.compat import StringIO, BytesIO, map -from pandas import compat - import os import sys -from numpy import nan import numpy as np +import pytest +from numpy import nan -from pandas import DataFrame -from pandas.io.parsers import (read_csv, TextFileReader) -from pandas.util.testing import assert_frame_equal - +import pandas._libs.parsers as parser import pandas.util.testing as tm - +from pandas import DataFrame, compat from pandas._libs.parsers import TextReader -import pandas._libs.parsers as parser +from pandas.compat import BytesIO, StringIO, map +from pandas.io.parsers import TextFileReader, read_csv +from pandas.util.testing import assert_frame_equal class TestTextReader(object): diff --git a/pandas/tests/io/parser/test_unsupported.py b/pandas/tests/io/parser/test_unsupported.py index 1c64c1516077d..c6fd250116779 100644 --- a/pandas/tests/io/parser/test_unsupported.py +++ b/pandas/tests/io/parser/test_unsupported.py @@ -9,15 +9,14 @@ test suite as new feature support is added to the parsers. """ +import pytest + import pandas.io.parsers as parsers import pandas.util.testing as tm - from pandas.compat import StringIO from pandas.errors import ParserError from pandas.io.parsers import read_csv -import pytest - @pytest.fixture(params=["python", "python-fwf"], ids=lambda val: val) def python_engine(request): diff --git a/pandas/tests/io/parser/usecols.py b/pandas/tests/io/parser/usecols.py index db01c20a56e9f..5fd2dc3f48e3e 100644 --- a/pandas/tests/io/parser/usecols.py +++ b/pandas/tests/io/parser/usecols.py @@ -5,11 +5,10 @@ for all of the parsers defined in parsers.py """ +import numpy as np import pytest -import numpy as np import pandas.util.testing as tm - from pandas import DataFrame, Index from pandas._libs.tslib import Timestamp from pandas.compat import StringIO diff --git a/setup.cfg b/setup.cfg index a5006d66868f6..aa7a31cd1b386 100644 --- a/setup.cfg +++ b/setup.cfg @@ -388,28 +388,6 @@ skip= pandas/tests/io/formats/test_css.py, pandas/tests/io/formats/test_to_latex.py, pandas/tests/io/formats/test_printing.py, - pandas/tests/io/parser/skiprows.py, - pandas/tests/io/parser/test_textreader.py, - pandas/tests/io/parser/converters.py, - pandas/tests/io/parser/na_values.py, - pandas/tests/io/parser/comment.py, - pandas/tests/io/parser/test_network.py, - pandas/tests/io/parser/dtypes.py, - pandas/tests/io/parser/parse_dates.py, - pandas/tests/io/parser/quoting.py, - pandas/tests/io/parser/multithread.py, - pandas/tests/io/parser/index_col.py, - pandas/tests/io/parser/test_read_fwf.py, - pandas/tests/io/parser/test_unsupported.py, - pandas/tests/io/parser/python_parser_only.py, - pandas/tests/io/parser/test_parsers.py, - pandas/tests/io/parser/c_parser_only.py, - pandas/tests/io/parser/dialect.py, - pandas/tests/io/parser/common.py, - pandas/tests/io/parser/compression.py, - pandas/tests/io/parser/usecols.py, - pandas/tests/io/parser/mangle_dupes.py, - pandas/tests/io/parser/header.py, pandas/tests/io/msgpack/test_buffer.py, pandas/tests/io/msgpack/test_read_size.py, pandas/tests/io/msgpack/test_pack.py,