Skip to content

Commit a35399e

Browse files
TomAugspurgerTomAugspurger
committed
Merge remote-tracking branch 'upstream/master' into ea-repr
2 parents d9df6bf + 6fad5a0 commit a35399e

23 files changed

+229
-358
lines changed

‎pandas/core/arrays/base.py

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
This is an experimental API and subject to breaking changes
66
without warning.
77
"""
8-
import numpy as np
9-
108
import operator
119

12-
from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass
13-
from pandas.errors import AbstractMethodError
10+
import numpy as np
11+
12+
from pandas.compat import PY3, set_function_name
1413
from pandas.compat.numpy import function as nv
15-
from pandas.compat import set_function_name, PY3
16-
from pandas.core import ops
14+
from pandas.errors import AbstractMethodError
15+
1716
from pandas.core.dtypes.common import is_list_like
17+
from pandas.core.dtypes.generic import ABCIndexClass, ABCSeries
18+
19+
from pandas.core import ops
1820

1921
_not_implemented_message = "{} does not implement {}."
2022

‎pandas/core/arrays/categorical.py

+26-41
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,46 @@
11
# pylint: disable=E1101,W0232
22

3-
import numpy as np
4-
from warnings import warn
53
import textwrap
4+
from warnings import warn
65

7-
from pandas import compat
8-
from pandas.compat import u, lzip
9-
from pandas._libs import lib, algos as libalgos
6+
import numpy as np
7+
8+
from pandas._libs import algos as libalgos, lib
9+
import pandas.compat as compat
10+
from pandas.compat import lzip, u
11+
from pandas.compat.numpy import function as nv
12+
from pandas.util._decorators import (
13+
Appender, Substitution, cache_readonly, deprecate_kwarg)
14+
from pandas.util._validators import validate_bool_kwarg, validate_fillna_kwargs
1015

11-
from pandas.core.dtypes.generic import (
12-
ABCSeries, ABCIndexClass, ABCCategoricalIndex)
13-
from pandas.core.dtypes.missing import isna, notna
14-
from pandas.core.dtypes.inference import is_hashable
1516
from pandas.core.dtypes.cast import (
16-
maybe_infer_to_datetimelike,
17-
coerce_indexer_dtype)
18-
from pandas.core.dtypes.dtypes import CategoricalDtype
17+
coerce_indexer_dtype, maybe_infer_to_datetimelike)
1918
from pandas.core.dtypes.common import (
20-
ensure_int64,
21-
ensure_object,
22-
ensure_platform_int,
23-
is_extension_array_dtype,
24-
is_dtype_equal,
25-
is_datetimelike,
26-
is_datetime64_dtype,
27-
is_timedelta64_dtype,
28-
is_categorical,
29-
is_categorical_dtype,
30-
is_float_dtype,
31-
is_integer_dtype,
32-
is_object_dtype,
33-
is_list_like, is_sequence,
34-
is_scalar, is_iterator,
35-
is_dict_like)
36-
37-
from pandas.core.algorithms import factorize, take_1d, unique1d, take
19+
ensure_int64, ensure_object, ensure_platform_int, is_categorical,
20+
is_categorical_dtype, is_datetime64_dtype, is_datetimelike, is_dict_like,
21+
is_dtype_equal, is_extension_array_dtype, is_float_dtype, is_integer_dtype,
22+
is_iterator, is_list_like, is_object_dtype, is_scalar, is_sequence,
23+
is_timedelta64_dtype)
24+
from pandas.core.dtypes.dtypes import CategoricalDtype
25+
from pandas.core.dtypes.generic import (
26+
ABCCategoricalIndex, ABCIndexClass, ABCSeries)
27+
from pandas.core.dtypes.inference import is_hashable
28+
from pandas.core.dtypes.missing import isna, notna
29+
3830
from pandas.core.accessor import PandasDelegate, delegate_names
39-
from pandas.core.base import (PandasObject,
40-
NoNewAttributesMixin, _shared_docs)
31+
import pandas.core.algorithms as algorithms
32+
from pandas.core.algorithms import factorize, take, take_1d, unique1d
33+
from pandas.core.base import NoNewAttributesMixin, PandasObject, _shared_docs
4134
import pandas.core.common as com
35+
from pandas.core.config import get_option
4236
from pandas.core.missing import interpolate_2d
43-
from pandas.compat.numpy import function as nv
44-
from pandas.util._decorators import (
45-
Appender, cache_readonly, deprecate_kwarg, Substitution)
46-
47-
import pandas.core.algorithms as algorithms
48-
4937
from pandas.core.sorting import nargsort
5038

5139
from pandas.io.formats import console
5240
from pandas.io.formats.terminal import get_terminal_size
53-
from pandas.util._validators import validate_bool_kwarg, validate_fillna_kwargs
54-
from pandas.core.config import get_option
5541

5642
from .base import ExtensionArray
5743

58-
5944
_take_msg = textwrap.dedent("""\
6045
Interpreting negative values in 'indexer' as missing values.
6146
In the future, this will change to meaning positional indices

‎pandas/core/arrays/datetimelike.py

+15-26
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,33 @@
55

66
import numpy as np
77

8-
from pandas._libs import lib, iNaT, NaT
8+
from pandas._libs import NaT, iNaT, lib
99
from pandas._libs.tslibs import timezones
10-
from pandas._libs.tslibs.timedeltas import delta_to_nanoseconds, Timedelta
11-
from pandas._libs.tslibs.timestamps import maybe_integer_op_deprecated
1210
from pandas._libs.tslibs.period import (
13-
Period, DIFFERENT_FREQ_INDEX, IncompatibleFrequency)
14-
11+
DIFFERENT_FREQ_INDEX, IncompatibleFrequency, Period)
12+
from pandas._libs.tslibs.timedeltas import Timedelta, delta_to_nanoseconds
13+
from pandas._libs.tslibs.timestamps import maybe_integer_op_deprecated
14+
import pandas.compat as compat
1515
from pandas.errors import (
1616
AbstractMethodError, NullFrequencyError, PerformanceWarning)
17-
from pandas import compat
18-
19-
from pandas.tseries import frequencies
20-
from pandas.tseries.offsets import Tick, DateOffset
17+
from pandas.util._decorators import deprecate_kwarg
2118

2219
from pandas.core.dtypes.common import (
23-
pandas_dtype,
24-
needs_i8_conversion,
25-
is_list_like,
26-
is_offsetlike,
27-
is_extension_array_dtype,
28-
is_datetime64_dtype,
29-
is_datetime64_any_dtype,
30-
is_datetime64tz_dtype,
31-
is_float_dtype,
32-
is_integer_dtype,
33-
is_bool_dtype,
34-
is_period_dtype,
35-
is_timedelta64_dtype,
36-
is_object_dtype)
37-
from pandas.core.dtypes.generic import ABCSeries, ABCDataFrame, ABCIndexClass
20+
is_bool_dtype, is_datetime64_any_dtype, is_datetime64_dtype,
21+
is_datetime64tz_dtype, is_extension_array_dtype, is_float_dtype,
22+
is_integer_dtype, is_list_like, is_object_dtype, is_offsetlike,
23+
is_period_dtype, is_timedelta64_dtype, needs_i8_conversion, pandas_dtype)
3824
from pandas.core.dtypes.dtypes import DatetimeTZDtype
25+
from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
3926
from pandas.core.dtypes.missing import isna
4027

41-
import pandas.core.common as com
4228
from pandas.core.algorithms import checked_add_with_arr, take, unique1d
29+
import pandas.core.common as com
30+
31+
from pandas.tseries import frequencies
32+
from pandas.tseries.offsets import DateOffset, Tick
4333

4434
from .base import ExtensionOpsMixin
45-
from pandas.util._decorators import deprecate_kwarg
4635

4736

4837
def _make_comparison_op(cls, op):

‎pandas/core/arrays/datetimes.py

+12-19
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,28 @@
66
from pytz import utc
77

88
from pandas._libs import lib, tslib
9-
from pandas._libs.tslib import Timestamp, NaT, iNaT
9+
from pandas._libs.tslib import NaT, Timestamp, iNaT
1010
from pandas._libs.tslibs import (
11-
ccalendar, normalize_date,
12-
conversion, fields, timezones,
13-
resolution as libresolution)
14-
15-
from pandas.util._decorators import cache_readonly, Appender
11+
ccalendar, conversion, fields, normalize_date, resolution as libresolution,
12+
timezones)
13+
import pandas.compat as compat
1614
from pandas.errors import PerformanceWarning
17-
from pandas import compat
15+
from pandas.util._decorators import Appender, cache_readonly
1816

1917
from pandas.core.dtypes.common import (
20-
_NS_DTYPE,
21-
is_object_dtype,
22-
is_int64_dtype,
23-
is_datetime64tz_dtype,
24-
is_datetime64_dtype)
18+
_NS_DTYPE, is_datetime64_dtype, is_datetime64tz_dtype, is_int64_dtype,
19+
is_object_dtype)
2520
from pandas.core.dtypes.dtypes import DatetimeTZDtype
26-
from pandas.core.dtypes.missing import isna
2721
from pandas.core.dtypes.generic import ABCIndexClass, ABCSeries
22+
from pandas.core.dtypes.missing import isna
2823

29-
import pandas.core.common as com
30-
from pandas.core.algorithms import checked_add_with_arr
3124
from pandas.core import ops
32-
33-
from pandas.tseries.frequencies import to_offset, get_period_alias
34-
from pandas.tseries.offsets import Tick, generate_range
35-
25+
from pandas.core.algorithms import checked_add_with_arr
3626
from pandas.core.arrays import datetimelike as dtl
27+
import pandas.core.common as com
3728

29+
from pandas.tseries.frequencies import get_period_alias, to_offset
30+
from pandas.tseries.offsets import Tick, generate_range
3831

3932
_midnight = time(0, 0)
4033

‎pandas/core/arrays/integer.py

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
1+
import copy
12
import sys
23
import warnings
3-
import copy
4-
import numpy as np
54

5+
import numpy as np
66

77
from pandas._libs import lib
8+
from pandas.compat import range, set_function_name, string_types
89
from pandas.util._decorators import cache_readonly
9-
from pandas.compat import range, string_types
10-
from pandas.compat import set_function_name
1110

12-
from pandas.core import nanops
11+
from pandas.core.dtypes.base import ExtensionDtype
1312
from pandas.core.dtypes.cast import astype_nansafe
14-
from pandas.core.dtypes.generic import ABCSeries, ABCIndexClass
1513
from pandas.core.dtypes.common import (
16-
is_integer, is_scalar, is_float,
17-
is_bool_dtype,
18-
is_float_dtype,
19-
is_integer_dtype,
20-
is_object_dtype,
21-
is_list_like)
22-
from pandas.core.arrays import ExtensionArray, ExtensionOpsMixin
23-
from pandas.core.dtypes.base import ExtensionDtype
14+
is_bool_dtype, is_float, is_float_dtype, is_integer, is_integer_dtype,
15+
is_list_like, is_object_dtype, is_scalar)
2416
from pandas.core.dtypes.dtypes import register_extension_dtype
17+
from pandas.core.dtypes.generic import ABCIndexClass, ABCSeries
2518
from pandas.core.dtypes.missing import isna, notna
2619

20+
from pandas.core import nanops
21+
from pandas.core.arrays import ExtensionArray, ExtensionOpsMixin
22+
2723

2824
class _IntegerDtype(ExtensionDtype):
2925
"""

‎pandas/core/arrays/interval.py

+17-18
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1+
from operator import le, lt
12
import textwrap
2-
import numpy as np
33

4-
from operator import le, lt
4+
import numpy as np
55

6-
from pandas._libs.interval import (Interval, IntervalMixin,
7-
intervals_to_interval_bounds)
6+
from pandas._libs.interval import (
7+
Interval, IntervalMixin, intervals_to_interval_bounds)
88
from pandas.compat import add_metaclass
99
from pandas.compat.numpy import function as nv
10-
import pandas.core.common as com
11-
from pandas.core.config import get_option
10+
from pandas.util._decorators import Appender
11+
from pandas.util._doctools import _WritableDoc
12+
1213
from pandas.core.dtypes.cast import maybe_convert_platform
13-
from pandas.core.dtypes.common import (is_categorical_dtype, is_float_dtype,
14-
is_integer_dtype, is_interval_dtype,
15-
is_scalar, is_string_dtype,
16-
is_datetime64_any_dtype,
17-
is_timedelta64_dtype, is_interval,
18-
pandas_dtype)
14+
from pandas.core.dtypes.common import (
15+
is_categorical_dtype, is_datetime64_any_dtype, is_float_dtype,
16+
is_integer_dtype, is_interval, is_interval_dtype, is_scalar,
17+
is_string_dtype, is_timedelta64_dtype, pandas_dtype)
1918
from pandas.core.dtypes.dtypes import IntervalDtype
20-
from pandas.core.dtypes.generic import (ABCDatetimeIndex, ABCPeriodIndex,
21-
ABCSeries, ABCIntervalIndex,
22-
ABCInterval)
19+
from pandas.core.dtypes.generic import (
20+
ABCDatetimeIndex, ABCInterval, ABCIntervalIndex, ABCPeriodIndex, ABCSeries)
2321
from pandas.core.dtypes.missing import isna, notna
22+
23+
import pandas.core.common as com
24+
from pandas.core.config import get_option
2425
from pandas.core.indexes.base import Index, ensure_index
25-
from pandas.util._decorators import Appender
26-
from pandas.util._doctools import _WritableDoc
2726

28-
from . import ExtensionArray, Categorical
27+
from . import Categorical, ExtensionArray
2928

3029
_VALID_CLOSED = {'left', 'right', 'both', 'neither'}
3130
_interval_shared_docs = {}

‎pandas/core/arrays/period.py

+16-29
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,35 @@
44

55
import numpy as np
66

7-
from pandas import compat
8-
from pandas.compat.numpy import function as nv
97
from pandas._libs.tslib import NaT, iNaT
10-
from pandas._libs.tslibs.period import (
11-
Period, IncompatibleFrequency, DIFFERENT_FREQ_INDEX,
12-
get_period_field_arr, period_asfreq_arr,
13-
)
148
from pandas._libs.tslibs import period as libperiod
15-
from pandas._libs.tslibs.timedeltas import delta_to_nanoseconds, Timedelta
169
from pandas._libs.tslibs.fields import isleapyear_arr
17-
from pandas.util._decorators import cache_readonly, Appender
10+
from pandas._libs.tslibs.period import (
11+
DIFFERENT_FREQ_INDEX, IncompatibleFrequency, Period, get_period_field_arr,
12+
period_asfreq_arr)
13+
from pandas._libs.tslibs.timedeltas import Timedelta, delta_to_nanoseconds
14+
import pandas.compat as compat
15+
from pandas.compat.numpy import function as nv
16+
from pandas.util._decorators import Appender, cache_readonly
1817
from pandas.util._validators import validate_fillna_kwargs
19-
import pandas.core.algorithms as algos
18+
2019
from pandas.core.dtypes.common import (
21-
is_integer_dtype, is_float_dtype, is_period_dtype,
22-
pandas_dtype,
23-
is_datetime64_dtype,
24-
is_categorical_dtype,
25-
is_list_like,
26-
is_array_like,
27-
is_object_dtype,
28-
is_string_dtype,
29-
is_datetime_or_timedelta_dtype,
30-
is_dtype_equal,
31-
ensure_object,
32-
_TD_DTYPE,
33-
)
20+
_TD_DTYPE, ensure_object, is_array_like, is_categorical_dtype,
21+
is_datetime64_dtype, is_datetime_or_timedelta_dtype, is_dtype_equal,
22+
is_float_dtype, is_integer_dtype, is_list_like, is_object_dtype,
23+
is_period_dtype, is_string_dtype, pandas_dtype)
3424
from pandas.core.dtypes.dtypes import PeriodDtype
35-
from pandas.core.dtypes.generic import (
36-
ABCSeries, ABCIndexClass, ABCPeriodIndex
37-
)
25+
from pandas.core.dtypes.generic import ABCIndexClass, ABCPeriodIndex, ABCSeries
3826
from pandas.core.dtypes.missing import isna, notna
39-
from pandas.core.missing import pad_1d, backfill_1d
4027

28+
import pandas.core.algorithms as algos
29+
from pandas.core.arrays import ExtensionArray, datetimelike as dtl
4130
import pandas.core.common as com
31+
from pandas.core.missing import backfill_1d, pad_1d
4232

4333
from pandas.tseries import frequencies
4434
from pandas.tseries.offsets import Tick
4535

46-
from pandas.core.arrays import ExtensionArray
47-
from pandas.core.arrays import datetimelike as dtl
48-
4936

5037
def _field_accessor(name, alias, docstring=None):
5138
def f(self):

0 commit comments

Comments
 (0)