Skip to content

Commit 7d6bd75

Browse files
alimcmaster1TomAugspurger
authored andcommitted
CLN: Isort io and compat dirs (pandas-dev#23534)
1 parent d0691e0 commit 7d6bd75

18 files changed

+106
-114
lines changed

pandas/compat/numpy/function.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919
"""
2020

2121
from numpy import ndarray
22-
from pandas.util._validators import (validate_args, validate_kwargs,
23-
validate_args_and_kwargs)
24-
from pandas.errors import UnsupportedFunctionCall
25-
from pandas.core.dtypes.common import is_integer, is_bool
22+
2623
from pandas.compat import OrderedDict
24+
from pandas.errors import UnsupportedFunctionCall
25+
from pandas.util._validators import (
26+
validate_args, validate_args_and_kwargs, validate_kwargs)
27+
28+
from pandas.core.dtypes.common import is_bool, is_integer
2729

2830

2931
class CompatValidator(object):

pandas/compat/pickle_compat.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
Support pre-0.12 series pickle compatibility.
33
"""
44

5-
import sys
6-
import pandas # noqa
75
import copy
86
import pickle as pkl
9-
from pandas import compat, Index
10-
from pandas.compat import u, string_types # noqa
7+
import sys
8+
9+
from pandas.compat import string_types, u # noqa
10+
11+
import pandas # noqa
12+
from pandas import Index, compat
1113

1214

1315
def load_reduce(self):

pandas/io/clipboard/clipboards.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import subprocess
2-
from .exceptions import PyperclipException
2+
33
from pandas.compat import PY2, text_type
44

5+
from .exceptions import PyperclipException
6+
57
EXCEPT_MSG = """
68
Pyperclip could not find a copy/paste mechanism for your system.
79
For more information, please visit https://pyperclip.readthedocs.org """

pandas/io/clipboard/windows.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
"""
22
This module implements clipboard handling on Windows using ctypes.
33
"""
4-
import time
54
import contextlib
65
import ctypes
7-
from ctypes import c_size_t, sizeof, c_wchar_p, get_errno, c_wchar
6+
from ctypes import c_size_t, c_wchar, c_wchar_p, get_errno, sizeof
7+
import time
8+
89
from .exceptions import PyperclipWindowsException
910

1011

pandas/io/formats/console.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
Internal module for console introspection
33
"""
44

5-
import sys
65
import locale
6+
import sys
7+
78
from pandas.io.formats.terminal import get_terminal_size
89

910
# -----------------------------------------------------------------------------

pandas/io/formats/csvs.py

+7-12
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,24 @@
55

66
from __future__ import print_function
77

8-
import warnings
9-
108
import csv as csvlib
9+
import os
10+
import warnings
1111
from zipfile import ZipFile
1212

1313
import numpy as np
14-
import os
1514

1615
from pandas._libs import writers as libwriters
17-
18-
from pandas import compat
1916
from pandas.compat import StringIO, range, zip
2017

21-
from pandas.core.dtypes.missing import notna
2218
from pandas.core.dtypes.generic import (
23-
ABCMultiIndex, ABCPeriodIndex, ABCDatetimeIndex, ABCIndexClass)
19+
ABCDatetimeIndex, ABCIndexClass, ABCMultiIndex, ABCPeriodIndex)
20+
from pandas.core.dtypes.missing import notna
21+
22+
from pandas import compat
2423

2524
from pandas.io.common import (
26-
_get_handle,
27-
_infer_compression,
28-
get_filepath_or_buffer,
29-
UnicodeWriter,
30-
)
25+
UnicodeWriter, _get_handle, _infer_compression, get_filepath_or_buffer)
3126

3227

3328
class CSVFormatter(object):

pandas/io/formats/excel.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
"""Utilities for conversion to writer-agnostic Excel representation
22
"""
33

4+
import itertools
45
import re
56
import warnings
6-
import itertools
77

88
import numpy as np
99

1010
from pandas.compat import reduce
11-
import pandas.core.common as com
1211

13-
from pandas.core.dtypes.common import is_float, is_scalar
1412
from pandas.core.dtypes import missing
13+
from pandas.core.dtypes.common import is_float, is_scalar
1514
from pandas.core.dtypes.generic import ABCMultiIndex, ABCPeriodIndex
15+
1616
from pandas import Index
17+
import pandas.core.common as com
1718

1819
from pandas.io.formats.css import CSSResolver, CSSWarning
19-
from pandas.io.formats.printing import pprint_thing
2020
from pandas.io.formats.format import get_level_lengths
21+
from pandas.io.formats.printing import pprint_thing
2122

2223

2324
class ExcelCell(object):

pandas/io/formats/format.py

+14-22
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,37 @@
55
"""
66

77
from __future__ import print_function
8-
# pylint: disable=W0141
98

109
from functools import partial
1110

1211
import numpy as np
1312

1413
from pandas._libs import lib
15-
from pandas._libs.tslibs import NaT, iNaT, Timestamp, Timedelta
1614
from pandas._libs.tslib import format_array_from_datetime
15+
from pandas._libs.tslibs import NaT, Timedelta, Timestamp, iNaT
16+
from pandas.compat import StringIO, lzip, map, u, zip
1717

18-
from pandas import compat
19-
from pandas.compat import StringIO, lzip, map, zip, u
20-
21-
from pandas.core.dtypes.missing import isna, notna
2218
from pandas.core.dtypes.common import (
23-
is_categorical_dtype,
24-
is_float_dtype,
25-
is_period_arraylike,
26-
is_integer_dtype,
27-
is_interval_dtype,
28-
is_datetimetz,
29-
is_integer,
30-
is_float,
31-
is_scalar,
32-
is_numeric_dtype,
33-
is_datetime64_dtype,
34-
is_timedelta64_dtype,
35-
is_list_like)
36-
from pandas.core.dtypes.generic import ABCSparseArray, ABCMultiIndex
19+
is_categorical_dtype, is_datetime64_dtype, is_datetimetz, is_float,
20+
is_float_dtype, is_integer, is_integer_dtype, is_interval_dtype,
21+
is_list_like, is_numeric_dtype, is_period_arraylike, is_scalar,
22+
is_timedelta64_dtype)
23+
from pandas.core.dtypes.generic import ABCMultiIndex, ABCSparseArray
24+
from pandas.core.dtypes.missing import isna, notna
25+
26+
from pandas import compat
3727
from pandas.core.base import PandasObject
3828
import pandas.core.common as com
39-
from pandas.core.index import Index, ensure_index
4029
from pandas.core.config import get_option, set_option
30+
from pandas.core.index import Index, ensure_index
4131
from pandas.core.indexes.datetimes import DatetimeIndex
4232
from pandas.core.indexes.period import PeriodIndex
4333

44-
from pandas.io.formats.terminal import get_terminal_size
4534
from pandas.io.common import _expand_user, _stringify_path
4635
from pandas.io.formats.printing import adjoin, justify, pprint_thing
36+
from pandas.io.formats.terminal import get_terminal_size
37+
38+
# pylint: disable=W0141
4739

4840

4941
common_docstring = """

pandas/io/formats/html.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@
44
"""
55

66
from __future__ import print_function
7-
from distutils.version import LooseVersion
87

8+
from distutils.version import LooseVersion
99
from textwrap import dedent
1010

11-
from pandas import compat
12-
from pandas.compat import (lzip, range, map, zip, u,
13-
OrderedDict, unichr)
11+
from pandas.compat import OrderedDict, lzip, map, range, u, unichr, zip
1412

15-
import pandas.core.common as com
1613
from pandas.core.dtypes.generic import ABCMultiIndex
14+
15+
from pandas import compat
16+
import pandas.core.common as com
1717
from pandas.core.config import get_option
1818

19+
from pandas.io.formats.format import (
20+
TableFormatter, buffer_put_lines, get_level_lengths)
1921
from pandas.io.formats.printing import pprint_thing
20-
from pandas.io.formats.format import (get_level_lengths,
21-
buffer_put_lines)
22-
from pandas.io.formats.format import TableFormatter
2322

2423

2524
class HTMLFormatter(TableFormatter):

pandas/io/formats/latex.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66

77
import numpy as np
88

9-
from pandas import compat
10-
from pandas.compat import range, map, zip, u
9+
from pandas.compat import map, range, u, zip
1110

1211
from pandas.core.dtypes.generic import ABCMultiIndex
1312

13+
from pandas import compat
14+
1415
from pandas.io.formats.format import TableFormatter
1516

1617

pandas/io/formats/printing.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
"""
44

55
import sys
6+
7+
from pandas.compat import u
8+
69
from pandas.core.dtypes.inference import is_sequence
10+
711
from pandas import compat
8-
from pandas.compat import u
912
from pandas.core.config import get_option
1013

1114

pandas/io/formats/style.py

+18-15
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,27 @@
22
Module for applying conditional formatting to
33
DataFrames and Series.
44
"""
5+
from collections import MutableMapping, defaultdict
6+
from contextlib import contextmanager
7+
import copy
58
from functools import partial
69
from itertools import product
7-
from contextlib import contextmanager
810
from uuid import uuid1
9-
import copy
10-
from collections import defaultdict, MutableMapping
11+
12+
import numpy as np
13+
14+
from pandas.compat import range
15+
from pandas.util._decorators import Appender
16+
17+
from pandas.core.dtypes.common import is_float, is_string_like
18+
from pandas.core.dtypes.generic import ABCSeries
19+
20+
import pandas as pd
21+
from pandas.api.types import is_list_like
22+
import pandas.core.common as com
23+
from pandas.core.config import get_option
24+
from pandas.core.generic import _shared_docs
25+
from pandas.core.indexing import _maybe_numeric_slice, _non_reducing_slice
1126

1227
try:
1328
from jinja2 import (
@@ -18,18 +33,6 @@
1833
"Please install with `conda install Jinja2`\n"
1934
"or `pip install Jinja2`")
2035

21-
from pandas.core.dtypes.common import is_float, is_string_like
22-
23-
import numpy as np
24-
import pandas as pd
25-
from pandas.api.types import is_list_like
26-
from pandas.compat import range
27-
from pandas.core.config import get_option
28-
from pandas.core.generic import _shared_docs
29-
import pandas.core.common as com
30-
from pandas.core.indexing import _maybe_numeric_slice, _non_reducing_slice
31-
from pandas.util._decorators import Appender
32-
from pandas.core.dtypes.generic import ABCSeries
3336

3437
try:
3538
import matplotlib.pyplot as plt

pandas/io/formats/terminal.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
import os
1717
import shutil
18-
from pandas.compat import PY3
1918

19+
from pandas.compat import PY3
2020

2121
__all__ = ['get_terminal_size', 'is_terminal']
2222

pandas/io/json/json.py

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
11
# pylint: disable-msg=E1101,W0613,W0603
22
from itertools import islice
33
import os
4+
45
import numpy as np
56

67
import pandas._libs.json as json
78
from pandas._libs.tslibs import iNaT
8-
from pandas.compat import StringIO, long, u, to_str
9-
from pandas import compat, isna
10-
from pandas import Series, DataFrame, to_datetime, MultiIndex
11-
from pandas.io.common import (get_filepath_or_buffer, _get_handle,
12-
_infer_compression, _stringify_path,
13-
BaseIterator)
14-
from pandas.io.parsers import _validate_integer
9+
from pandas.compat import StringIO, long, to_str, u
10+
11+
from pandas.core.dtypes.common import is_period_dtype
12+
13+
from pandas import DataFrame, MultiIndex, Series, compat, isna, to_datetime
1514
import pandas.core.common as com
1615
from pandas.core.reshape.concat import concat
16+
17+
from pandas.io.common import (
18+
BaseIterator, _get_handle, _infer_compression, _stringify_path,
19+
get_filepath_or_buffer)
1720
from pandas.io.formats.printing import pprint_thing
21+
from pandas.io.parsers import _validate_integer
22+
1823
from .normalize import _convert_to_line_delimits
1924
from .table_schema import build_table_schema, parse_table_schema
20-
from pandas.core.dtypes.common import is_period_dtype
2125

2226
loads = json.loads
2327
dumps = json.dumps

pandas/io/json/normalize.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# ---------------------------------------------------------------------
22
# JSON normalization routines
33

4-
import copy
54
from collections import defaultdict
5+
import copy
6+
67
import numpy as np
78

89
from pandas._libs.writers import convert_json_to_lines
9-
from pandas import compat, DataFrame
10+
11+
from pandas import DataFrame, compat
1012

1113

1214
def _convert_to_line_delimits(s):

pandas/io/json/table_schema.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
import warnings
77

88
import pandas._libs.json as json
9+
10+
from pandas.core.dtypes.common import (
11+
is_bool_dtype, is_categorical_dtype, is_datetime64_dtype,
12+
is_datetime64tz_dtype, is_integer_dtype, is_numeric_dtype, is_period_dtype,
13+
is_string_dtype, is_timedelta64_dtype)
14+
915
from pandas import DataFrame
1016
from pandas.api.types import CategoricalDtype
1117
import pandas.core.common as com
12-
from pandas.core.dtypes.common import (
13-
is_integer_dtype, is_timedelta64_dtype, is_numeric_dtype,
14-
is_bool_dtype, is_datetime64_dtype, is_datetime64tz_dtype,
15-
is_categorical_dtype, is_period_dtype, is_string_dtype
16-
)
1718

1819
loads = json.loads
1920

0 commit comments

Comments
 (0)