Skip to content

Commit 866f1eb

Browse files
streecktm9k1
authored andcommitted
style: fix import format at pandas/core/reshape (pandas-dev#23387)
1 parent d43a6be commit 866f1eb

File tree

9 files changed

+83
-116
lines changed

9 files changed

+83
-116
lines changed

pandas/core/reshape/api.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# flake8: noqa
22

33
from pandas.core.reshape.concat import concat
4-
from pandas.core.reshape.melt import melt, lreshape, wide_to_long
4+
from pandas.core.reshape.melt import lreshape, melt, wide_to_long
5+
from pandas.core.reshape.merge import merge, merge_asof, merge_ordered
6+
from pandas.core.reshape.pivot import crosstab, pivot, pivot_table
57
from pandas.core.reshape.reshape import get_dummies
6-
from pandas.core.reshape.merge import merge, merge_ordered, merge_asof
7-
from pandas.core.reshape.pivot import pivot_table, pivot, crosstab
88
from pandas.core.reshape.tile import cut, qcut

pandas/core/reshape/concat.py

+11-9
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
"""
44

55
import numpy as np
6-
from pandas import compat, DataFrame, Series, Index, MultiIndex
7-
from pandas.core.index import (_get_objs_combined_axis,
8-
ensure_index, _get_consensus_names,
9-
_all_indexes_same)
10-
from pandas.core.arrays.categorical import (_factorize_from_iterable,
11-
_factorize_from_iterables)
12-
from pandas.core.internals import concatenate_block_managers
6+
7+
import pandas.core.dtypes.concat as _concat
8+
9+
from pandas import DataFrame, Index, MultiIndex, Series, compat
1310
from pandas.core import common as com
14-
import pandas.core.indexes.base as ibase
11+
from pandas.core.arrays.categorical import (
12+
_factorize_from_iterable, _factorize_from_iterables)
1513
from pandas.core.generic import NDFrame
16-
import pandas.core.dtypes.concat as _concat
14+
from pandas.core.index import (
15+
_all_indexes_same, _get_consensus_names, _get_objs_combined_axis,
16+
ensure_index)
17+
import pandas.core.indexes.base as ibase
18+
from pandas.core.internals import concatenate_block_managers
1719

1820
# ---------------------------------------------------------------------
1921
# Concatenate DataFrame objects

pandas/core/reshape/melt.py

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
# pylint: disable=E1101,E1103
22
# pylint: disable=W0703,W0622,W0613,W0201
3+
import re
4+
35
import numpy as np
46

5-
from pandas.core.dtypes.common import is_list_like
6-
from pandas import compat
7-
from pandas.core.arrays import Categorical
7+
from pandas.util._decorators import Appender
88

9+
from pandas.core.dtypes.common import is_extension_type, is_list_like
910
from pandas.core.dtypes.generic import ABCMultiIndex
11+
from pandas.core.dtypes.missing import notna
1012

13+
from pandas import compat
14+
from pandas.core.arrays import Categorical
1115
from pandas.core.frame import _shared_docs
12-
from pandas.util._decorators import Appender
13-
14-
import re
15-
from pandas.core.dtypes.missing import notna
16-
from pandas.core.dtypes.common import is_extension_type
17-
from pandas.core.tools.numeric import to_numeric
1816
from pandas.core.reshape.concat import concat
17+
from pandas.core.tools.numeric import to_numeric
1918

2019

2120
@Appender(_shared_docs['melt'] %

pandas/core/reshape/merge.py

+20-35
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,34 @@
33
"""
44

55
import copy
6-
import warnings
76
import string
7+
import warnings
88

99
import numpy as np
10-
from pandas.compat import range, lzip, zip, map, filter
11-
import pandas.compat as compat
1210

13-
from pandas import (Categorical, DataFrame,
14-
Index, MultiIndex, Timedelta, Series)
15-
from pandas.core.arrays.categorical import _recode_for_categories
16-
from pandas.core.frame import _merge_doc
17-
from pandas.core.dtypes.common import (
18-
is_datetime64tz_dtype,
19-
is_datetime64_dtype,
20-
needs_i8_conversion,
21-
is_int64_dtype,
22-
is_array_like,
23-
is_categorical_dtype,
24-
is_integer_dtype,
25-
is_float_dtype,
26-
is_number,
27-
is_numeric_dtype,
28-
is_integer,
29-
is_int_or_datetime_dtype,
30-
is_dtype_equal,
31-
is_bool,
32-
is_bool_dtype,
33-
is_list_like,
34-
is_datetimelike,
35-
ensure_int64,
36-
ensure_float64,
37-
ensure_object)
38-
from pandas.core.dtypes.missing import na_value_for_dtype, isnull
39-
from pandas.core.internals import (items_overlap_with_suffix,
40-
concatenate_block_managers)
11+
from pandas._libs import hashtable as libhashtable, join as libjoin, lib
12+
import pandas.compat as compat
13+
from pandas.compat import filter, lzip, map, range, zip
14+
from pandas.errors import MergeError
4115
from pandas.util._decorators import Appender, Substitution
4216

43-
from pandas.core.sorting import is_int64_overflow_possible
17+
from pandas.core.dtypes.common import (
18+
ensure_float64, ensure_int64, ensure_object, is_array_like, is_bool,
19+
is_bool_dtype, is_categorical_dtype, is_datetime64_dtype,
20+
is_datetime64tz_dtype, is_datetimelike, is_dtype_equal, is_float_dtype,
21+
is_int64_dtype, is_int_or_datetime_dtype, is_integer, is_integer_dtype,
22+
is_list_like, is_number, is_numeric_dtype, needs_i8_conversion)
23+
from pandas.core.dtypes.missing import isnull, na_value_for_dtype
24+
25+
from pandas import Categorical, DataFrame, Index, MultiIndex, Series, Timedelta
4426
import pandas.core.algorithms as algos
45-
import pandas.core.sorting as sorting
27+
from pandas.core.arrays.categorical import _recode_for_categories
4628
import pandas.core.common as com
47-
from pandas._libs import hashtable as libhashtable, join as libjoin, lib
48-
from pandas.errors import MergeError
29+
from pandas.core.frame import _merge_doc
30+
from pandas.core.internals import (
31+
concatenate_block_managers, items_overlap_with_suffix)
32+
import pandas.core.sorting as sorting
33+
from pandas.core.sorting import is_int64_overflow_possible
4934

5035

5136
@Substitution('\nleft : DataFrame')

pandas/core/reshape/pivot.py

+12-15
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
# pylint: disable=E1103
2+
import numpy as np
23

4+
from pandas.compat import lrange, range, zip
5+
from pandas.util._decorators import Appender, Substitution
36

4-
from pandas.core.dtypes.common import (
5-
is_list_like, is_scalar, is_integer_dtype)
6-
from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries
77
from pandas.core.dtypes.cast import maybe_downcast_to_dtype
8+
from pandas.core.dtypes.common import is_integer_dtype, is_list_like, is_scalar
9+
from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries
810

9-
from pandas.core.reshape.concat import concat
10-
from pandas.core.series import Series
11-
from pandas.core.groupby import Grouper
12-
from pandas.core.reshape.util import cartesian_product
13-
from pandas.core.index import Index, MultiIndex, _get_objs_combined_axis
14-
from pandas.compat import range, lrange, zip
1511
from pandas import compat
1612
import pandas.core.common as com
17-
from pandas.util._decorators import Appender, Substitution
18-
1913
from pandas.core.frame import _shared_docs
20-
# Note: We need to make sure `frame` is imported before `pivot`, otherwise
21-
# _shared_docs['pivot_table'] will not yet exist. TODO: Fix this dependency
22-
23-
import numpy as np
14+
from pandas.core.groupby import Grouper
15+
from pandas.core.index import Index, MultiIndex, _get_objs_combined_axis
16+
from pandas.core.reshape.concat import concat
17+
from pandas.core.reshape.util import cartesian_product
18+
from pandas.core.series import Series
2419

2520

21+
# Note: We need to make sure `frame` is imported before `pivot`, otherwise
22+
# _shared_docs['pivot_table'] will not yet exist. TODO: Fix this dependency
2623
@Substitution('\ndata : DataFrame')
2724
@Appender(_shared_docs['pivot_table'], indents=1)
2825
def pivot_table(data, values=None, index=None, columns=None, aggfunc='mean',

pandas/core/reshape/reshape.py

+16-21
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,31 @@
11
# pylint: disable=E1101,E1103
22
# pylint: disable=W0703,W0622,W0613,W0201
3-
from pandas.compat import range, text_type, zip, u, PY2
4-
from pandas import compat
53
from functools import partial
64
import itertools
75

86
import numpy as np
97

10-
from pandas.core.dtypes.common import (
11-
ensure_platform_int,
12-
is_list_like, is_bool_dtype,
13-
is_extension_array_dtype,
14-
needs_i8_conversion, is_sparse, is_object_dtype)
15-
from pandas.core.dtypes.cast import maybe_promote
16-
from pandas.core.dtypes.missing import notna
17-
18-
from pandas.core.series import Series
19-
from pandas.core.frame import DataFrame
20-
21-
from pandas.core.sparse.api import SparseDataFrame, SparseSeries
22-
from pandas.core.arrays import SparseArray
8+
from pandas._libs import algos as _algos, reshape as _reshape
239
from pandas._libs.sparse import IntIndex
10+
from pandas.compat import PY2, range, text_type, u, zip
2411

25-
from pandas.core.arrays import Categorical
26-
from pandas.core.arrays.categorical import _factorize_from_iterable
27-
from pandas.core.sorting import (get_group_index, get_compressed_ids,
28-
compress_group_index, decons_obs_group_ids)
12+
from pandas.core.dtypes.cast import maybe_promote
13+
from pandas.core.dtypes.common import (
14+
ensure_platform_int, is_bool_dtype, is_extension_array_dtype, is_list_like,
15+
is_object_dtype, is_sparse, needs_i8_conversion)
16+
from pandas.core.dtypes.missing import notna
2917

18+
from pandas import compat
3019
import pandas.core.algorithms as algos
31-
from pandas._libs import algos as _algos, reshape as _reshape
32-
20+
from pandas.core.arrays import Categorical, SparseArray
21+
from pandas.core.arrays.categorical import _factorize_from_iterable
22+
from pandas.core.frame import DataFrame
3323
from pandas.core.index import Index, MultiIndex
24+
from pandas.core.series import Series
25+
from pandas.core.sorting import (
26+
compress_group_index, decons_obs_group_ids, get_compressed_ids,
27+
get_group_index)
28+
from pandas.core.sparse.api import SparseDataFrame, SparseSeries
3429

3530

3631
class _Unstacker(object):

pandas/core/reshape/tile.py

+11-15
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,21 @@
33
"""
44
from functools import partial
55

6-
from pandas.core.dtypes.missing import isna
6+
import numpy as np
7+
8+
from pandas._libs.lib import infer_dtype
9+
710
from pandas.core.dtypes.common import (
8-
is_integer,
9-
is_scalar,
10-
is_categorical_dtype,
11-
is_datetime64_dtype,
12-
is_timedelta64_dtype,
13-
is_datetime64tz_dtype,
14-
is_datetime_or_timedelta_dtype,
15-
ensure_int64)
11+
ensure_int64, is_categorical_dtype, is_datetime64_dtype,
12+
is_datetime64tz_dtype, is_datetime_or_timedelta_dtype, is_integer,
13+
is_scalar, is_timedelta64_dtype)
14+
from pandas.core.dtypes.missing import isna
1615

16+
from pandas import (
17+
Categorical, Index, Interval, IntervalIndex, Series, Timedelta, Timestamp,
18+
to_datetime, to_timedelta)
1719
import pandas.core.algorithms as algos
1820
import pandas.core.nanops as nanops
19-
from pandas._libs.lib import infer_dtype
20-
from pandas import (to_timedelta, to_datetime,
21-
Categorical, Timestamp, Timedelta,
22-
Series, Index, Interval, IntervalIndex)
23-
24-
import numpy as np
2521

2622

2723
def cut(x, bins, right=True, labels=None, retbins=False, precision=3,

pandas/core/reshape/util.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import numpy as np
22

3+
from pandas.compat import reduce
4+
35
from pandas.core.dtypes.common import is_list_like
46

5-
from pandas.compat import reduce
67
from pandas.core import common as com
78

89

setup.cfg

-8
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,6 @@ skip=
152152
pandas/core/internals/concat.py,
153153
pandas/core/internals/managers.py,
154154
pandas/core/internals/blocks.py,
155-
pandas/core/reshape/concat.py,
156-
pandas/core/reshape/tile.py,
157-
pandas/core/reshape/melt.py,
158-
pandas/core/reshape/api.py,
159-
pandas/core/reshape/util.py,
160-
pandas/core/reshape/merge.py,
161-
pandas/core/reshape/reshape.py,
162-
pandas/core/reshape/pivot.py,
163155
pandas/core/sparse/api.py,
164156
pandas/core/sparse/series.py,
165157
pandas/core/sparse/frame.py,

0 commit comments

Comments
 (0)