Skip to content

Commit ece7a52

Browse files
alimcmaster1Pingviinituutti
alimcmaster1
authored and
Pingviinituutti
committed
CLN: Isort core/*.py and core/indexes/ (pandas-dev#23764)
1 parent 5163a15 commit ece7a52

26 files changed

+328
-466
lines changed

‎pandas/core/algorithms.py

+16-25
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,31 @@
33
intended for public consumption
44
"""
55
from __future__ import division
6-
from warnings import warn, catch_warnings, simplefilter
6+
77
from textwrap import dedent
8+
from warnings import catch_warnings, simplefilter, warn
89

910
import numpy as np
1011

12+
from pandas._libs import algos, hashtable as htable, lib
13+
from pandas._libs.tslib import iNaT
14+
from pandas.util._decorators import Appender, Substitution, deprecate_kwarg
15+
1116
from pandas.core.dtypes.cast import (
12-
maybe_promote, construct_1d_object_array_from_listlike)
13-
from pandas.core.dtypes.generic import (
14-
ABCSeries, ABCIndex,
15-
ABCIndexClass)
17+
construct_1d_object_array_from_listlike, maybe_promote)
1618
from pandas.core.dtypes.common import (
17-
is_array_like,
18-
is_unsigned_integer_dtype, is_signed_integer_dtype,
19-
is_integer_dtype, is_complex_dtype,
20-
is_object_dtype,
21-
is_extension_array_dtype,
22-
is_categorical_dtype, is_sparse,
23-
is_period_dtype,
24-
is_numeric_dtype, is_float_dtype,
25-
is_bool_dtype, needs_i8_conversion,
26-
is_datetimetz,
27-
is_datetime64_any_dtype, is_datetime64tz_dtype,
28-
is_timedelta64_dtype, is_datetimelike,
29-
is_interval_dtype, is_scalar, is_list_like,
30-
ensure_platform_int, ensure_object,
31-
ensure_float64, ensure_uint64,
32-
ensure_int64)
19+
ensure_float64, ensure_int64, ensure_object, ensure_platform_int,
20+
ensure_uint64, is_array_like, is_bool_dtype, is_categorical_dtype,
21+
is_complex_dtype, is_datetime64_any_dtype, is_datetime64tz_dtype,
22+
is_datetimelike, is_datetimetz, is_extension_array_dtype, is_float_dtype,
23+
is_integer_dtype, is_interval_dtype, is_list_like, is_numeric_dtype,
24+
is_object_dtype, is_period_dtype, is_scalar, is_signed_integer_dtype,
25+
is_sparse, is_timedelta64_dtype, is_unsigned_integer_dtype,
26+
needs_i8_conversion)
27+
from pandas.core.dtypes.generic import ABCIndex, ABCIndexClass, ABCSeries
3328
from pandas.core.dtypes.missing import isna, na_value_for_dtype
3429

3530
from pandas.core import common as com
36-
from pandas._libs import algos, lib, hashtable as htable
37-
from pandas._libs.tslib import iNaT
38-
from pandas.util._decorators import (Appender, Substitution,
39-
deprecate_kwarg)
4031

4132
_shared_docs = {}
4233

‎pandas/core/apply.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import warnings
2+
23
import numpy as np
3-
from pandas import compat
4+
45
from pandas._libs import reduction
5-
from pandas.core.dtypes.generic import ABCSeries
6-
from pandas.core.dtypes.common import (
7-
is_extension_type,
8-
is_dict_like,
9-
is_list_like,
10-
is_sequence)
6+
import pandas.compat as compat
117
from pandas.util._decorators import cache_readonly
128

9+
from pandas.core.dtypes.common import (
10+
is_dict_like, is_extension_type, is_list_like, is_sequence)
11+
from pandas.core.dtypes.generic import ABCSeries
12+
1313
from pandas.io.formats.printing import pprint_thing
1414

1515

‎pandas/core/base.py

+15-19
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
"""
22
Base and utility classes for pandas objects.
33
"""
4-
import warnings
54
import textwrap
6-
from pandas import compat
7-
from pandas.compat import builtins
8-
import numpy as np
5+
import warnings
96

10-
from pandas.core.dtypes.missing import isna
11-
from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries, ABCIndexClass
12-
from pandas.core.dtypes.common import (
13-
is_datetimelike,
14-
is_object_dtype,
15-
is_list_like,
16-
is_scalar,
17-
is_extension_type,
18-
is_extension_array_dtype)
7+
import numpy as np
198

20-
from pandas.util._validators import validate_bool_kwarg
21-
from pandas.errors import AbstractMethodError
22-
from pandas.core import common as com, algorithms
23-
import pandas.core.nanops as nanops
249
import pandas._libs.lib as lib
10+
import pandas.compat as compat
11+
from pandas.compat import PYPY, OrderedDict, builtins
2512
from pandas.compat.numpy import function as nv
26-
from pandas.compat import PYPY, OrderedDict
27-
from pandas.util._decorators import Appender, cache_readonly, Substitution
13+
from pandas.errors import AbstractMethodError
14+
from pandas.util._decorators import Appender, Substitution, cache_readonly
15+
from pandas.util._validators import validate_bool_kwarg
2816

17+
from pandas.core.dtypes.common import (
18+
is_datetimelike, is_extension_array_dtype, is_extension_type, is_list_like,
19+
is_object_dtype, is_scalar)
20+
from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
21+
from pandas.core.dtypes.missing import isna
22+
23+
from pandas.core import algorithms, common as com
2924
from pandas.core.accessor import DirNamesMixin
25+
import pandas.core.nanops as nanops
3026

3127
_shared_docs = dict()
3228
_indexops_doc_kwargs = dict(klass='IndexOpsMixin', inplace='',

‎pandas/core/categorical.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import warnings
22

3+
from pandas.core.dtypes.dtypes import CategoricalDtype # noqa
4+
5+
from pandas.core.arrays import Categorical # noqa
6+
37
# TODO: Remove after 0.23.x
48
warnings.warn("'pandas.core' is private. Use 'pandas.Categorical'",
59
FutureWarning, stacklevel=2)
6-
7-
from pandas.core.arrays import Categorical # noqa
8-
from pandas.core.dtypes.dtypes import CategoricalDtype # noqa

‎pandas/core/common.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,23 @@
44
Note: pandas.core.common is *not* part of the public API.
55
"""
66

7+
import collections
78
from datetime import datetime, timedelta
89
from functools import partial
910
import inspect
10-
import collections
1111

1212
import numpy as np
13+
1314
from pandas._libs import lib, tslibs
15+
import pandas.compat as compat
16+
from pandas.compat import PY36, OrderedDict, iteritems
1417

15-
from pandas import compat
16-
from pandas.compat import iteritems, PY36, OrderedDict
17-
from pandas.core.dtypes.generic import (
18-
ABCSeries, ABCIndex, ABCIndexClass
19-
)
18+
from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
2019
from pandas.core.dtypes.common import (
21-
is_integer, is_bool_dtype, is_extension_array_dtype, is_array_like
22-
)
20+
is_array_like, is_bool_dtype, is_extension_array_dtype, is_integer)
21+
from pandas.core.dtypes.generic import ABCIndex, ABCIndexClass, ABCSeries
2322
from pandas.core.dtypes.inference import _iterable_not_string
2423
from pandas.core.dtypes.missing import isna, isnull, notnull # noqa
25-
from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
2624

2725

2826
class SettingWithCopyError(ValueError):

‎pandas/core/config.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
4949
"""
5050

51-
import re
52-
5351
from collections import namedtuple
5452
from contextlib import contextmanager
53+
import re
5554
import warnings
56-
from pandas.compat import map, lmap, u
55+
5756
import pandas.compat as compat
57+
from pandas.compat import lmap, map, u
5858

5959
DeprecatedOption = namedtuple('DeprecatedOption', 'key msg rkey removal_ver')
6060
RegisteredOption = namedtuple('RegisteredOption',

‎pandas/core/config_init.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
1111
"""
1212
import pandas.core.config as cf
13-
from pandas.core.config import (is_int, is_bool, is_text, is_instance_factory,
14-
is_one_of_factory, is_callable)
13+
from pandas.core.config import (
14+
is_bool, is_callable, is_instance_factory, is_int, is_one_of_factory,
15+
is_text)
16+
1517
from pandas.io.formats.console import detect_console_encoding
1618
from pandas.io.formats.terminal import is_terminal
1719

‎pandas/core/generic.py

+30-42
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,52 @@
11
# pylint: disable=W0231,E1101
22
import collections
33
import functools
4-
import warnings
5-
import operator
6-
import weakref
74
import gc
85
import json
6+
import operator
7+
import warnings
8+
import weakref
99

1010
import numpy as np
11-
import pandas as pd
1211

13-
from pandas._libs import properties, Timestamp, iNaT
12+
from pandas._libs import Timestamp, iNaT, properties
13+
import pandas.compat as compat
14+
from pandas.compat import (
15+
cPickle as pkl, isidentifier, lrange, lzip, map, set_function_name,
16+
string_types, to_str, zip)
17+
from pandas.compat.numpy import function as nv
1418
from pandas.errors import AbstractMethodError
19+
from pandas.util._decorators import (
20+
Appender, Substitution, rewrite_axis_style_signature)
21+
from pandas.util._validators import validate_bool_kwarg, validate_fillna_kwargs
1522

16-
from pandas.core.dtypes.common import (
17-
ensure_int64,
18-
ensure_object,
19-
is_scalar,
20-
is_number,
21-
is_integer, is_bool,
22-
is_bool_dtype,
23-
is_numeric_dtype,
24-
is_datetime64_any_dtype,
25-
is_timedelta64_dtype,
26-
is_datetime64tz_dtype,
27-
is_list_like,
28-
is_dict_like,
29-
is_re_compilable,
30-
is_period_arraylike,
31-
is_object_dtype,
32-
is_extension_array_dtype,
33-
pandas_dtype)
3423
from pandas.core.dtypes.cast import maybe_promote, maybe_upcast_putmask
24+
from pandas.core.dtypes.common import (
25+
ensure_int64, ensure_object, is_bool, is_bool_dtype,
26+
is_datetime64_any_dtype, is_datetime64tz_dtype, is_dict_like,
27+
is_extension_array_dtype, is_integer, is_list_like, is_number,
28+
is_numeric_dtype, is_object_dtype, is_period_arraylike, is_re_compilable,
29+
is_scalar, is_timedelta64_dtype, pandas_dtype)
30+
from pandas.core.dtypes.generic import ABCDataFrame, ABCPanel, ABCSeries
3531
from pandas.core.dtypes.inference import is_hashable
3632
from pandas.core.dtypes.missing import isna, notna
37-
from pandas.core.dtypes.generic import ABCSeries, ABCPanel, ABCDataFrame
3833

34+
import pandas as pd
35+
from pandas.core import config, missing, nanops
36+
import pandas.core.algorithms as algos
3937
from pandas.core.base import PandasObject, SelectionMixin
40-
from pandas.core.index import (Index, MultiIndex, ensure_index,
41-
InvalidIndexError, RangeIndex)
42-
import pandas.core.indexing as indexing
38+
import pandas.core.common as com
39+
from pandas.core.index import (
40+
Index, InvalidIndexError, MultiIndex, RangeIndex, ensure_index)
4341
from pandas.core.indexes.datetimes import DatetimeIndex
44-
from pandas.core.indexes.period import PeriodIndex, Period
42+
from pandas.core.indexes.period import Period, PeriodIndex
43+
import pandas.core.indexing as indexing
4544
from pandas.core.internals import BlockManager
46-
import pandas.core.algorithms as algos
47-
import pandas.core.common as com
48-
import pandas.core.missing as missing
45+
from pandas.core.ops import _align_method_FRAME
46+
47+
from pandas.io.formats.format import DataFrameFormatter, format_percentiles
4948
from pandas.io.formats.printing import pprint_thing
50-
from pandas.io.formats.format import format_percentiles, DataFrameFormatter
5149
from pandas.tseries.frequencies import to_offset
52-
from pandas import compat
53-
from pandas.compat.numpy import function as nv
54-
from pandas.compat import (map, zip, lzip, lrange, string_types, to_str,
55-
isidentifier, set_function_name, cPickle as pkl)
56-
from pandas.core.ops import _align_method_FRAME
57-
import pandas.core.nanops as nanops
58-
from pandas.util._decorators import (Appender, Substitution,
59-
rewrite_axis_style_signature)
60-
from pandas.util._validators import validate_bool_kwarg, validate_fillna_kwargs
61-
from pandas.core import config
6250

6351
# goal is to be able to define the docs close to function, while still being
6452
# able to share

‎pandas/core/indexes/accessors.py

+5-7
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33
"""
44
import numpy as np
55

6-
from pandas.core.dtypes.generic import ABCSeries
76
from pandas.core.dtypes.common import (
8-
is_period_arraylike,
9-
is_datetime_arraylike, is_integer_dtype,
10-
is_datetime64_dtype, is_datetime64tz_dtype,
11-
is_timedelta64_dtype, is_categorical_dtype,
12-
is_list_like)
7+
is_categorical_dtype, is_datetime64_dtype, is_datetime64tz_dtype,
8+
is_datetime_arraylike, is_integer_dtype, is_list_like, is_period_arraylike,
9+
is_timedelta64_dtype)
10+
from pandas.core.dtypes.generic import ABCSeries
1311

1412
from pandas.core.accessor import PandasDelegate, delegate_names
13+
from pandas.core.algorithms import take_1d
1514
from pandas.core.base import NoNewAttributesMixin, PandasObject
1615
from pandas.core.indexes.datetimes import DatetimeIndex
1716
from pandas.core.indexes.period import PeriodArray
1817
from pandas.core.indexes.timedeltas import TimedeltaIndex
19-
from pandas.core.algorithms import take_1d
2018

2119

2220
class Properties(PandasDelegate, PandasObject, NoNewAttributesMixin):

‎pandas/core/indexes/api.py

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
import textwrap
22
import warnings
33

4-
from pandas.core.indexes.base import (Index,
5-
_new_Index,
6-
ensure_index,
7-
ensure_index_from_sequences,
8-
InvalidIndexError) # noqa
9-
from pandas.core.indexes.category import CategoricalIndex # noqa
10-
from pandas.core.indexes.multi import MultiIndex # noqa
11-
from pandas.core.indexes.interval import IntervalIndex # noqa
12-
from pandas.core.indexes.numeric import (NumericIndex, Float64Index, # noqa
13-
Int64Index, UInt64Index)
14-
from pandas.core.indexes.range import RangeIndex # noqa
15-
from pandas.core.indexes.timedeltas import TimedeltaIndex
16-
from pandas.core.indexes.period import PeriodIndex
17-
from pandas.core.indexes.datetimes import DatetimeIndex
4+
from pandas._libs import NaT, lib
185

196
import pandas.core.common as com
20-
from pandas._libs import lib, NaT
7+
from pandas.core.indexes.base import (
8+
Index, _new_Index, ensure_index, ensure_index_from_sequences)
9+
from pandas.core.indexes.base import InvalidIndexError # noqa:F401
10+
from pandas.core.indexes.category import CategoricalIndex # noqa:F401
11+
from pandas.core.indexes.datetimes import DatetimeIndex
12+
from pandas.core.indexes.interval import IntervalIndex # noqa:F401
13+
from pandas.core.indexes.multi import MultiIndex # noqa:F401
14+
from pandas.core.indexes.numeric import ( # noqa:F401
15+
Float64Index, Int64Index, NumericIndex, UInt64Index)
16+
from pandas.core.indexes.period import PeriodIndex
17+
from pandas.core.indexes.range import RangeIndex # noqa:F401
18+
from pandas.core.indexes.timedeltas import TimedeltaIndex
2119

2220
_sort_msg = textwrap.dedent("""\
2321
Sorting because non-concatenation axis is not aligned. A future version

0 commit comments

Comments
 (0)