CLN: move pandas.tseries.index -> pandas.core.indexes.datetimes

Author: jreback

pandas/compat/pickle_compat.py

@@ -95,6 +95,10 @@ def load_reduce(self):
         ('pandas.core.indexes.range', 'RangeIndex'),
     ('pandas.indexes.multi', 'MultiIndex'):
         ('pandas.core.indexes.multi', 'MultiIndex'),
+    ('pandas.tseries.index', '_new_DatetimeIndex'):
+        ('pandas.core.indexes.datetimes', '_new_DatetimeIndex'),
+    ('pandas.tseries.index', 'DatetimeIndex'):
+        ('pandas.core.indexes.datetimes', 'DatetimeIndex'),
     ('pandas.tseries.period', 'PeriodIndex'):
         ('pandas.core.indexes.period', 'PeriodIndex')
 }

pandas/core/api.py

@@ -26,7 +26,7 @@
 from pandas.core.dtypes.cast import to_numeric
 from pandas.tseries.offsets import DateOffset
 from pandas.tseries.tools import to_datetime
-from pandas.tseries.index import (DatetimeIndex, Timestamp,
+from pandas.core.indexes.datetimes import (DatetimeIndex, Timestamp,
                                   date_range, bdate_range)
 from pandas.core.indexes.timedeltas import TimedeltaIndex, Timedelta
 from pandas.core.indexes.period import Period, PeriodIndex

pandas/core/frame.py

@@ -83,7 +83,7 @@
 from pandas.util.validators import validate_bool_kwarg
 
 from pandas.core.indexes.period import PeriodIndex
-from pandas.tseries.index import DatetimeIndex
+from pandas.core.indexes.datetimes import DatetimeIndex
 from pandas.core.indexes.timedeltas import TimedeltaIndex
 
 import pandas.core.base as base

pandas/core/generic.py

@@ -37,7 +37,7 @@
 from pandas.core.index import (Index, MultiIndex, _ensure_index,
                                InvalidIndexError)
 import pandas.core.indexing as indexing
-from pandas.tseries.index import DatetimeIndex
+from pandas.core.indexes.datetimes import DatetimeIndex
 from pandas.core.indexes.period import PeriodIndex, Period
 from pandas.core.internals import BlockManager
 import pandas.core.algorithms as algos

pandas/core/indexes/accessors.py

@@ -12,7 +12,7 @@
     is_list_like)
 
 from pandas.core.base import PandasDelegate, NoNewAttributesMixin
-from pandas.tseries.index import DatetimeIndex
+from pandas.core.indexes.datetimes import DatetimeIndex
 from pandas._libs.period import IncompatibleFrequency  # noqa
 from pandas.core.indexes.period import PeriodIndex
 from pandas.core.indexes.timedeltas import TimedeltaIndex

pandas/core/indexes/base.py

@@ -184,7 +184,7 @@ def __new__(cls, data=None, dtype=None, copy=False, name=None,
             if (is_datetime64_any_dtype(data) or
                 (dtype is not None and is_datetime64_any_dtype(dtype)) or
                     'tz' in kwargs):
-                from pandas.tseries.index import DatetimeIndex
+                from pandas.core.indexes.datetimes import DatetimeIndex
                 result = DatetimeIndex(data, copy=copy, name=name,
                                        dtype=dtype, **kwargs)
                 if dtype is not None and is_dtype_equal(_o_dtype, dtype):
@@ -299,7 +299,8 @@ def __new__(cls, data=None, dtype=None, copy=False, name=None,
                         if (lib.is_datetime_with_singletz_array(subarr) or
                                 'tz' in kwargs):
                             # only when subarr has the same tz
-                            from pandas.tseries.index import DatetimeIndex
+                            from pandas.core.indexes.datetimes import (
+                                DatetimeIndex)
                             try:
                                 return DatetimeIndex(subarr, copy=copy,
                                                      name=name, **kwargs)
@@ -1010,7 +1011,7 @@ def to_datetime(self, dayfirst=False):
         warnings.warn("to_datetime is deprecated. Use pd.to_datetime(...)",
                       FutureWarning, stacklevel=2)
 
-        from pandas.tseries.index import DatetimeIndex
+        from pandas.core.indexes.datetimes import DatetimeIndex
         if self.inferred_type == 'string':
             from dateutil.parser import parse
             parser = lambda x: parse(x, dayfirst=dayfirst)
@@ -2665,7 +2666,7 @@ def get_indexer_for(self, target, **kwargs):
 
     def _maybe_promote(self, other):
         # A hack, but it works
-        from pandas.tseries.index import DatetimeIndex
+        from pandas.core.indexes.datetimes import DatetimeIndex
         if self.inferred_type == 'date' and isinstance(other, DatetimeIndex):
             return DatetimeIndex(self), other
         elif self.inferred_type == 'boolean':

pandas/core/indexes/datetimelike.py

@@ -666,7 +666,7 @@ def __add__(self, other):
 
         def __sub__(self, other):
             from pandas.core.index import Index
-            from pandas.tseries.index import DatetimeIndex
+            from pandas.core.indexes.datetimes import DatetimeIndex
             from pandas.core.indexes.timedeltas import TimedeltaIndex
             from pandas.tseries.offsets import DateOffset
             if isinstance(other, TimedeltaIndex):

pandas/tseries/index.py renamed to pandas/core/indexes/datetimes.py

@@ -35,7 +35,8 @@
 from pandas.tseries.frequencies import (
     to_offset, get_period_alias,
     Resolution)
-from pandas.core.indexes.datetimelike import DatelikeOps, TimelikeOps, DatetimeIndexOpsMixin
+from pandas.core.indexes.datetimelike import (
+    DatelikeOps, TimelikeOps, DatetimeIndexOpsMixin)
 from pandas.tseries.offsets import DateOffset, generate_range, Tick, CDay
 from pandas.tseries.tools import parse_time_string, normalize_date, to_time
 from pandas.tseries.timedeltas import to_timedelta

pandas/core/indexes/period.py

@@ -24,7 +24,7 @@
 
 import pandas.tseries.frequencies as frequencies
 from pandas.tseries.frequencies import get_freq_code as _gfc
-from pandas.tseries.index import DatetimeIndex, Int64Index, Index
+from pandas.core.indexes.datetimes import DatetimeIndex, Int64Index, Index
 from pandas.core.indexes.timedeltas import TimedeltaIndex
 from pandas.core.indexes.datetimelike import DatelikeOps, DatetimeIndexOpsMixin
 from pandas.tseries.tools import parse_time_string

pandas/core/internals.py

@@ -54,7 +54,7 @@
 from pandas.core.index import Index, MultiIndex, _ensure_index
 from pandas.core.indexing import maybe_convert_indices, length_of_indexer
 from pandas.core.categorical import Categorical, maybe_to_categorical
-from pandas.tseries.index import DatetimeIndex
+from pandas.core.indexes.datetimes import DatetimeIndex
 from pandas.io.formats.printing import pprint_thing
 
 import pandas.core.missing as missing

pandas/core/resample.py

@@ -10,7 +10,7 @@
                                  SeriesGroupBy, groupby, PanelGroupBy)
 
 from pandas.tseries.frequencies import to_offset, is_subperiod, is_superperiod
-from pandas.tseries.index import DatetimeIndex, date_range
+from pandas.core.indexes.datetimes import DatetimeIndex, date_range
 from pandas.core.indexes.timedeltas import TimedeltaIndex
 from pandas.tseries.offsets import DateOffset, Tick, Day, _delta_to_nanoseconds
 from pandas.core.indexes.period import PeriodIndex, period_range

pandas/core/series.py

@@ -52,9 +52,9 @@
 from pandas.core.internals import SingleBlockManager
 from pandas.core.categorical import Categorical, CategoricalAccessor
 import pandas.core.strings as strings
-from pandas.core.indexes.accessors import (maybe_to_datetimelike,
-                                   CombinedDatetimelikeProperties)
-from pandas.tseries.index import DatetimeIndex
+from pandas.core.indexes.accessors import (
+    maybe_to_datetimelike, CombinedDatetimelikeProperties)
+from pandas.core.indexes.datetimes import DatetimeIndex
 from pandas.core.indexes.timedeltas import TimedeltaIndex
 from pandas.core.indexes.period import PeriodIndex
 from pandas import compat

pandas/io/formats/format.py

@@ -38,7 +38,7 @@
 import pandas._libs.lib as lib
 from pandas._libs.tslib import (iNaT, Timestamp, Timedelta,
                                 format_array_from_datetime)
-from pandas.tseries.index import DatetimeIndex
+from pandas.core.indexes.datetimes import DatetimeIndex
 from pandas.core.indexes.period import PeriodIndex
 import pandas as pd
 import numpy as np

pandas/plotting/_converter.py

@@ -26,7 +26,7 @@
 from pandas.core.index import Index
 
 from pandas.core.series import Series
-from pandas.tseries.index import date_range
+from pandas.core.indexes.datetimes import date_range
 import pandas.tseries.tools as tools
 import pandas.tseries.frequencies as frequencies
 from pandas.tseries.frequencies import FreqGroup

pandas/plotting/_timeseries.py

@@ -6,7 +6,7 @@
 from pandas.core.indexes.period import Period
 from pandas.tseries.offsets import DateOffset
 import pandas.tseries.frequencies as frequencies
-from pandas.tseries.index import DatetimeIndex
+from pandas.core.indexes.datetimes import DatetimeIndex
 from pandas.core.indexes.period import PeriodIndex
 from pandas.core.indexes.timedeltas import TimedeltaIndex
 from pandas.io.formats.printing import pprint_thing

pandas/tests/indexes/common.py

@@ -9,6 +9,7 @@
                     RangeIndex, MultiIndex, CategoricalIndex, DatetimeIndex,
                     TimedeltaIndex, PeriodIndex, IntervalIndex,
                     notnull, isnull)
+from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin
 from pandas.core.dtypes.common import needs_i8_conversion
 from pandas.util.testing import assertRaisesRegexp
 from pandas._libs.tslib import iNaT
@@ -789,7 +790,7 @@ def test_numpy_ufuncs(self):
                          np.arccos, np.arctan, np.sinh, np.cosh, np.tanh,
                          np.arcsinh, np.arccosh, np.arctanh, np.deg2rad,
                          np.rad2deg]:
-                if isinstance(idx, pd.tseries.base.DatetimeIndexOpsMixin):
+                if isinstance(idx, DatetimeIndexOpsMixin):
                     # raise TypeError or ValueError (PeriodIndex)
                     # PeriodIndex behavior should be changed in future version
                     with tm.assertRaises(Exception):
@@ -812,7 +813,7 @@ def test_numpy_ufuncs(self):
                                 func(idx)
 
             for func in [np.isfinite, np.isinf, np.isnan, np.signbit]:
-                if isinstance(idx, pd.tseries.base.DatetimeIndexOpsMixin):
+                if isinstance(idx, DatetimeIndexOpsMixin):
                     # raise TypeError or ValueError (PeriodIndex)
                     with tm.assertRaises(Exception):
                         func(idx)
@@ -847,7 +848,7 @@ def test_hasnans_isnans(self):
 
                 if len(index) == 0:
                     continue
-                elif isinstance(index, pd.tseries.base.DatetimeIndexOpsMixin):
+                elif isinstance(index, DatetimeIndexOpsMixin):
                     values[1] = iNaT
                 elif isinstance(index, (Int64Index, UInt64Index)):
                     continue
@@ -887,7 +888,7 @@ def test_fillna(self):
                 idx = index.copy()
                 values = idx.values
 
-                if isinstance(index, pd.tseries.base.DatetimeIndexOpsMixin):
+                if isinstance(index, DatetimeIndexOpsMixin):
                     values[1] = iNaT
                 elif isinstance(index, (Int64Index, UInt64Index)):
                     continue

pandas/tests/indexes/datetimes/test_date_range.py

@@ -9,7 +9,7 @@
 import pandas as pd
 import pandas.util.testing as tm
 from pandas import compat
-from pandas.tseries.index import bdate_range, cdate_range
+from pandas.core.indexes.datetimes import bdate_range, cdate_range
 from pandas import date_range, offsets, DatetimeIndex, Timestamp
 from pandas.tseries.offsets import (generate_range, CDay, BDay,
                                     DateOffset, MonthEnd)

pandas/tests/indexes/datetimes/test_ops.py

@@ -8,7 +8,7 @@
 import pandas._libs.tslib as tslib
 import pandas.util.testing as tm
 from pandas.errors import PerformanceWarning
-from pandas.tseries.index import cdate_range
+from pandas.core.indexes.datetimes import cdate_range
 from pandas import (DatetimeIndex, PeriodIndex, Series, Timestamp, Timedelta,
                     date_range, TimedeltaIndex, _np_version_under1p10, Index,
                     datetime, Float64Index, offsets, bdate_range)

pandas/tests/indexes/datetimes/test_setops.py

@@ -4,7 +4,7 @@
 
 import pandas as pd
 import pandas.util.testing as tm
-from pandas.tseries.index import cdate_range
+from pandas.core.indexes.datetimes import cdate_range
 from pandas import (DatetimeIndex, date_range, Series, bdate_range, DataFrame,
                     Int64Index, Index, to_datetime)
 from pandas.tseries.offsets import Minute, BMonthEnd, MonthEnd

pandas/tests/indexes/test_base.py

@@ -21,7 +21,7 @@
 
 import pandas.core.config as cf
 
-from pandas.tseries.index import _to_m8
+from pandas.core.indexes.datetimes import _to_m8
 
 import pandas as pd
 from pandas._libs.lib import Timestamp

pandas/tests/io/json/test_ujson.py

@@ -1452,7 +1452,7 @@ def testIndex(self):
         tm.assert_index_equal(i, outp)
 
     def test_datetimeindex(self):
-        from pandas.tseries.index import date_range
+        from pandas.core.indexes.datetimes import date_range
 
         rng = date_range('1/1/2000', periods=20)
 

pandas/tests/io/parser/parse_dates.py

@@ -23,7 +23,7 @@
 from pandas import compat
 from pandas.compat import parse_date, StringIO, lrange
 from pandas.compat.numpy import np_array_datetime64_compat
-from pandas.tseries.index import date_range
+from pandas.core.indexes.datetimes import date_range
 
 
 class ParseDatesTests(object):

pandas/tests/plotting/test_datetimelike.py

@@ -8,7 +8,7 @@
 import numpy as np
 from pandas import Index, Series, DataFrame
 from pandas.compat import is_platform_mac
-from pandas.tseries.index import date_range, bdate_range
+from pandas.core.indexes.datetimes import date_range, bdate_range
 from pandas.core.indexes.timedeltas import timedelta_range
 from pandas.tseries.offsets import DateOffset
 from pandas.core.indexes.period import period_range, Period, PeriodIndex

pandas/tests/reshape/test_concat.py

@@ -1503,7 +1503,7 @@ def test_concat_exclude_none(self):
         self.assertRaises(ValueError, concat, [None, None])
 
     def test_concat_datetime64_block(self):
-        from pandas.tseries.index import date_range
+        from pandas.core.indexes.datetimes import date_range
 
         rng = date_range('1/1/2000', periods=10)
 

pandas/tests/series/test_analytics.py

@@ -13,7 +13,7 @@
 from pandas import (Series, Categorical, DataFrame, isnull, notnull,
                     bdate_range, date_range, _np_version_under1p10)
 from pandas.core.index import MultiIndex
-from pandas.tseries.index import Timestamp
+from pandas.core.indexes.datetimes import Timestamp
 from pandas.core.indexes.timedeltas import Timedelta
 import pandas.core.config as cf
 

pandas/tests/series/test_api.py

@@ -5,7 +5,7 @@
 import pandas as pd
 
 from pandas import Index, Series, DataFrame, date_range
-from pandas.tseries.index import Timestamp
+from pandas.core.indexes.datetimes import Timestamp
 
 from pandas.compat import range
 from pandas import compat

pandas/tests/series/test_constructors.py

@@ -13,7 +13,7 @@
     is_datetime64tz_dtype)
 from pandas import (Index, Series, isnull, date_range,
                     NaT, period_range, MultiIndex, IntervalIndex)
-from pandas.tseries.index import Timestamp, DatetimeIndex
+from pandas.core.indexes.datetimes import Timestamp, DatetimeIndex
 
 from pandas._libs import lib
 from pandas._libs.tslib import iNaT

pandas/tests/series/test_datetime_values.py

@@ -364,8 +364,8 @@ def test_valid_dt_with_missing_values(self):
 
     def test_dt_accessor_api(self):
         # GH 9322
-        from pandas.core.indexes.accessors import (CombinedDatetimelikeProperties,
-                                           DatetimeProperties)
+        from pandas.core.indexes.accessors import (
+            CombinedDatetimelikeProperties, DatetimeProperties)
         self.assertIs(Series.dt, CombinedDatetimelikeProperties)
 
         s = Series(date_range('2000-01-01', periods=3))

pandas/tests/series/test_internals.py

@@ -7,7 +7,7 @@
 import numpy as np
 
 from pandas import Series
-from pandas.tseries.index import Timestamp
+from pandas.core.indexes.datetimes import Timestamp
 import pandas._libs.lib as lib
 
 from pandas.util.testing import assert_series_equal

pandas/tests/series/test_operators.py

@@ -13,7 +13,7 @@
 from pandas import (Index, Series, DataFrame, isnull, bdate_range,
                     NaT, date_range, timedelta_range,
                     _np_version_under1p8)
-from pandas.tseries.index import Timestamp
+from pandas.core.indexes.datetimes import Timestamp
 from pandas.core.indexes.timedeltas import Timedelta
 import pandas.core.nanops as nanops
 

pandas/tests/series/test_quantile.py

@@ -6,7 +6,7 @@
 import pandas as pd
 
 from pandas import (Index, Series, _np_version_under1p9)
-from pandas.tseries.index import Timestamp
+from pandas.core.indexes.datetimes import Timestamp
 from pandas.core.dtypes.common import is_integer
 import pandas.util.testing as tm
 

pandas/tests/series/test_timeseries.py

@@ -9,7 +9,7 @@
 from pandas._libs.tslib import iNaT
 from pandas.compat import lrange, StringIO, product
 from pandas.core.indexes.timedeltas import TimedeltaIndex
-from pandas.tseries.index import DatetimeIndex
+from pandas.core.indexes.datetimes import DatetimeIndex
 from pandas.tseries.offsets import BDay, BMonthEnd
 from pandas import (Index, Series, date_range, NaT, concat, DataFrame,
                     Timestamp, to_datetime, offsets,

pandas/tests/sparse/test_frame.py

@@ -14,7 +14,7 @@
     is_float_dtype,
     is_object_dtype,
     is_float)
-from pandas.tseries.index import DatetimeIndex
+from pandas.core.indexes.datetimes import DatetimeIndex
 from pandas.tseries.offsets import BDay
 from pandas.util import testing as tm
 from pandas.compat import lrange

pandas/tests/test_resample.py

@@ -19,7 +19,7 @@
 from pandas.core.groupby import DataError
 from pandas.tseries.frequencies import MONTHS, DAYS
 from pandas.tseries.frequencies import to_offset
-from pandas.tseries.index import date_range
+from pandas.core.indexes.datetimes import date_range
 from pandas.tseries.offsets import Minute, BDay
 from pandas.core.indexes.period import period_range, PeriodIndex, Period
 from pandas.core.resample import (DatetimeIndex, TimeGrouper,

pandas/tests/tseries/test_offsets.py

@@ -15,7 +15,8 @@
 from pandas.tseries.frequencies import (_offset_map, get_freq_code,
                                         _get_freq_str, _INVALID_FREQ_ERROR,
                                         get_offset, get_standard_freq)
-from pandas.tseries.index import _to_m8, DatetimeIndex, _daterange_cache
+from pandas.core.indexes.datetimes import (
+    _to_m8, DatetimeIndex, _daterange_cache)
 from pandas.tseries.offsets import (BDay, CDay, BQuarterEnd, BMonthEnd,
                                     BusinessHour, WeekOfMonth, CBMonthEnd,
                                     CustomBusinessHour, WeekDay,

pandas/tests/tseries/test_timezones.py

@@ -10,7 +10,7 @@
 import pandas.tseries.tools as tools
 import pandas.tseries.offsets as offsets
 from pandas.compat import lrange, zip
-from pandas.tseries.index import bdate_range, date_range
+from pandas.core.indexes.datetimes import bdate_range, date_range
 from pandas.core.dtypes.dtypes import DatetimeTZDtype
 from pandas._libs import tslib
 from pandas import (Index, Series, DataFrame, isnull, Timestamp, NaT,