From 9ccaf51b1bf50d1b92076cc097504fd958a9049f Mon Sep 17 00:00:00 2001 From: JustinZhengBC Date: Tue, 16 Oct 2018 17:28:46 -0700 Subject: [PATCH] CLN import from pandas.core.arrays when possible --- pandas/core/arrays/datetimes.py | 4 ++-- pandas/core/arrays/period.py | 2 +- pandas/core/groupby/generic.py | 2 +- pandas/tests/arrays/test_datetimelike.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pandas/core/arrays/datetimes.py b/pandas/core/arrays/datetimes.py index 4cc33d7afd6c8..0f07a9cf3c0e0 100644 --- a/pandas/core/arrays/datetimes.py +++ b/pandas/core/arrays/datetimes.py @@ -508,7 +508,7 @@ def _add_delta(self, delta): The result's name is set outside of _add_delta by the calling method (__add__ or __sub__) """ - from pandas.core.arrays.timedeltas import TimedeltaArrayMixin + from pandas.core.arrays import TimedeltaArrayMixin if isinstance(delta, (Tick, timedelta, np.timedelta64)): new_values = self._add_delta_td(delta) @@ -803,7 +803,7 @@ def to_period(self, freq=None): pandas.PeriodIndex: Immutable ndarray holding ordinal values pandas.DatetimeIndex.to_pydatetime: Return DatetimeIndex as object """ - from pandas.core.arrays.period import PeriodArrayMixin + from pandas.core.arrays import PeriodArrayMixin if self.tz is not None: warnings.warn("Converting to PeriodArray/Index representation " diff --git a/pandas/core/arrays/period.py b/pandas/core/arrays/period.py index 8624ddd8965e8..16fa9ccb43b4d 100644 --- a/pandas/core/arrays/period.py +++ b/pandas/core/arrays/period.py @@ -302,7 +302,7 @@ def to_timestamp(self, freq=None, how='start'): ------- DatetimeArray/Index """ - from pandas.core.arrays.datetimes import DatetimeArrayMixin + from pandas.core.arrays import DatetimeArrayMixin how = libperiod._validate_end_alias(how) diff --git a/pandas/core/groupby/generic.py b/pandas/core/groupby/generic.py index 957f3be8cf6ae..63bf67854e5cd 100644 --- a/pandas/core/groupby/generic.py +++ b/pandas/core/groupby/generic.py @@ -44,7 +44,7 @@ from pandas.core.dtypes.cast import maybe_downcast_to_dtype from pandas.core.base import SpecificationError, DataError from pandas.core.index import Index, MultiIndex, CategoricalIndex -from pandas.core.arrays.categorical import Categorical +from pandas.core.arrays import Categorical from pandas.core.internals import BlockManager, make_block from pandas.compat.numpy import _np_version_under1p13 diff --git a/pandas/tests/arrays/test_datetimelike.py b/pandas/tests/arrays/test_datetimelike.py index 6bb4241451b3f..bfce5fb1462d9 100644 --- a/pandas/tests/arrays/test_datetimelike.py +++ b/pandas/tests/arrays/test_datetimelike.py @@ -5,9 +5,9 @@ import pandas as pd import pandas.util.testing as tm -from pandas.core.arrays.datetimes import DatetimeArrayMixin -from pandas.core.arrays.timedeltas import TimedeltaArrayMixin -from pandas.core.arrays.period import PeriodArrayMixin +from pandas.core.arrays import (DatetimeArrayMixin, + TimedeltaArrayMixin, + PeriodArrayMixin) # TODO: more freq variants