CLN: move pandas.tseries.timedeltas, pandas.tseries.tools -> pandas.core.tools

Author: jreback

doc/source/conf.py

@@ -231,7 +231,7 @@
 moved_api_pages = [
     'pandas.core.common.isnull', 'pandas.core.common.notnull', 'pandas.core.reshape.get_dummies',
     'pandas.tools.merge.concat', 'pandas.tools.merge.merge', 'pandas.tools.pivot.pivot_table',
-    'pandas.tseries.tools.to_datetime', 'pandas.io.clipboard.read_clipboard', 'pandas.io.excel.ExcelFile.parse',
+    'pandas.core.tools.datetimes.to_datetime', 'pandas.io.clipboard.read_clipboard', 'pandas.io.excel.ExcelFile.parse',
     'pandas.io.excel.read_excel', 'pandas.io.html.read_html', 'pandas.io.json.read_json',
     'pandas.io.parsers.read_csv', 'pandas.io.parsers.read_fwf', 'pandas.io.parsers.read_table',
     'pandas.io.pickle.read_pickle', 'pandas.io.pytables.HDFStore.append', 'pandas.io.pytables.HDFStore.get',

pandas/_libs/period.pyx

@@ -34,7 +34,7 @@ from tslib cimport (
 )
 
 from pandas.tseries import offsets
-from pandas.tseries.tools import parse_time_string
+from pandas.core.tools.datetimes import parse_time_string
 from pandas.tseries import frequencies
 
 cdef int64_t NPY_NAT = util.get_nat()

pandas/core/api.py

@@ -30,7 +30,8 @@
 from pandas.core.indexing import IndexSlice
 from pandas.core.dtypes.cast import to_numeric
 from pandas.tseries.offsets import DateOffset
-from pandas.tseries.tools import to_datetime
+from pandas.core.tools.datetimes import to_datetime
+from pandas.core.tools.timedeltas import to_timedelta
 from pandas.core.resample import TimeGrouper
 
 # see gh-14094.

pandas/core/computation/pytables.py

@@ -14,7 +14,7 @@
 from pandas.core.computation.ops import is_term, UndefinedVariableError
 from pandas.core.computation.expr import BaseExprVisitor
 from pandas.core.computation.common import _ensure_decoded
-from pandas.tseries.timedeltas import _coerce_scalar_to_timedelta_type
+from pandas.core.tools.timedeltas import _coerce_scalar_to_timedelta_type
 
 
 class Scope(expr.Scope):

pandas/core/datetools.py

@@ -4,7 +4,7 @@
 
 import warnings
 
-from pandas.tseries.tools import *
+from pandas.core.tools.datetimes import *
 from pandas.tseries.offsets import *
 from pandas.tseries.frequencies import *
 

pandas/core/dtypes/cast.py

@@ -548,7 +548,7 @@ def coerce_to_dtypes(result, dtypes):
     if len(result) != len(dtypes):
         raise AssertionError("_coerce_to_dtypes requires equal len arrays")
 
-    from pandas.tseries.timedeltas import _coerce_scalar_to_timedelta_type
+    from pandas.core.tools.timedeltas import _coerce_scalar_to_timedelta_type
 
     def conv(r, dtype):
         try:
@@ -670,7 +670,7 @@ def maybe_convert_objects(values, convert_dates=True, convert_numeric=True,
     if convert_timedeltas and values.dtype == np.object_:
 
         if convert_timedeltas == 'coerce':
-            from pandas.tseries.timedeltas import to_timedelta
+            from pandas.core.tools.timedeltas import to_timedelta
             new_values = to_timedelta(values, coerce=True)
 
             # if we are all nans then leave me alone
@@ -872,8 +872,8 @@ def maybe_cast_to_datetime(value, dtype, errors='raise'):
     """ try to cast the array/value to a datetimelike dtype, converting float
     nan to iNaT
     """
-    from pandas.tseries.timedeltas import to_timedelta
-    from pandas.tseries.tools import to_datetime
+    from pandas.core.tools.timedeltas import to_timedelta
+    from pandas.core.tools.datetimes import to_datetime
 
     if dtype is not None:
         if isinstance(dtype, string_types):

pandas/core/generic.py

@@ -5361,7 +5361,7 @@ def truncate(self, before=None, after=None, axis=None, copy=True):
         # if we have a date index, convert to dates, otherwise
         # treat like a slice
         if ax.is_all_dates:
-            from pandas.tseries.tools import to_datetime
+            from pandas.core.tools.datetimes import to_datetime
             before = to_datetime(before)
             after = to_datetime(after)
 

pandas/core/indexes/datetimes.py

@@ -38,13 +38,14 @@
 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
+from pandas.core.tools.datetimes import (
+    parse_time_string, normalize_date, to_time)
+from pandas.core.tools.timedeltas import to_timedelta
 from pandas.util.decorators import (Appender, cache_readonly,
                                     deprecate_kwarg, Substitution)
 import pandas.core.common as com
 import pandas.tseries.offsets as offsets
-import pandas.tseries.tools as tools
+import pandas.core.tools.datetimes as tools
 
 from pandas._libs import (lib, index as libindex, tslib as libts,
                           algos as libalgos, join as libjoin,

pandas/core/indexes/period.py

@@ -27,7 +27,7 @@
 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
+from pandas.core.tools.datetimes import parse_time_string
 import pandas.tseries.offsets as offsets
 
 from pandas._libs.lib import infer_dtype

pandas/core/indexes/timedeltas.py

@@ -29,8 +29,8 @@
 import pandas.core.dtypes.concat as _concat
 from pandas.util.decorators import Appender, Substitution, deprecate_kwarg
 from pandas.core.indexes.datetimelike import TimelikeOps, DatetimeIndexOpsMixin
-from pandas.tseries.timedeltas import (to_timedelta,
-                                       _coerce_scalar_to_timedelta_type)
+from pandas.core.tools.timedeltas import (
+    to_timedelta, _coerce_scalar_to_timedelta_type)
 from pandas.tseries.offsets import Tick, DateOffset
 from pandas._libs import (lib, index as libindex, tslib as libts,
                           join as libjoin, Timedelta, NaT, iNaT)

pandas/core/ops.py

@@ -442,7 +442,7 @@ def _validate(self, lvalues, rvalues, name):
 
     def _convert_to_array(self, values, name=None, other=None):
         """converts values to ndarray"""
-        from pandas.tseries.timedeltas import to_timedelta
+        from pandas.core.tools.timedeltas import to_timedelta
 
         ovalues = values
         supplied_dtype = None
@@ -508,7 +508,7 @@ def _convert_to_array(self, values, name=None, other=None):
         return values
 
     def _convert_for_datetime(self, lvalues, rvalues):
-        from pandas.tseries.timedeltas import to_timedelta
+        from pandas.core.tools.timedeltas import to_timedelta
 
         mask = isnull(lvalues) | isnull(rvalues)
 

pandas/tseries/tools.py renamed to pandas/core/tools/datetimes.py

@@ -35,7 +35,7 @@
                               _get_handle, UnicodeReader, UTF8Recoder,
                               BaseIterator,
                               _NA_VALUES, _infer_compression)
-from pandas.tseries import tools
+from pandas.core.tools import datetimes as tools
 
 from pandas.util.decorators import Appender
 

pandas/tseries/timedeltas.py renamed to pandas/core/tools/timedeltas.py

@@ -22,7 +22,7 @@
                            string_types, text_type)
 from pandas.core.api import DataFrame, Series
 from pandas.core.base import PandasObject
-from pandas.tseries.tools import to_datetime
+from pandas.core.tools.datetimes import to_datetime
 
 from contextlib import contextmanager
 

pandas/io/parsers.py

@@ -27,7 +27,7 @@
 
 from pandas.core.series import Series
 from pandas.core.indexes.datetimes import date_range
-import pandas.tseries.tools as tools
+import pandas.core.tools.datetimes as tools
 import pandas.tseries.frequencies as frequencies
 from pandas.tseries.frequencies import FreqGroup
 from pandas.core.indexes.period import Period, PeriodIndex

pandas/io/sql.py

@@ -8,7 +8,8 @@
 
 from pandas.compat import lrange
 from pandas import (DataFrame, Series, Index, MultiIndex,
-                    RangeIndex, date_range, IntervalIndex)
+                    RangeIndex, date_range, IntervalIndex,
+                    to_datetime)
 from pandas.core.dtypes.common import (
     is_object_dtype,
     is_categorical_dtype,
@@ -202,8 +203,8 @@ def test_set_index_cast_datetimeindex(self):
         # don't cast a DatetimeIndex WITH a tz, leave as object
         # GH 6032
         i = (pd.DatetimeIndex(
-            pd.tseries.tools.to_datetime(['2013-1-1 13:00',
-                                          '2013-1-2 14:00'], errors="raise"))
+            to_datetime(['2013-1-1 13:00',
+                         '2013-1-2 14:00'], errors="raise"))
              .tz_localize('US/Pacific'))
         df = DataFrame(np.random.randn(2, 1), columns=['A'])
 

pandas/plotting/_converter.py

@@ -873,7 +873,7 @@ def test_operators_timedelta64(self):
         mixed['F'] = Timestamp('20130101')
 
         # results in an object array
-        from pandas.tseries.timedeltas import (
+        from pandas.core.tools.timedeltas import (
             _coerce_scalar_to_timedelta_type as _coerce)
 
         result = mixed.min()

pandas/tests/frame/test_alter_axes.py

@@ -10,8 +10,8 @@
 
 import pandas as pd
 from pandas._libs import tslib, lib
-from pandas.tseries import tools
-from pandas.tseries.tools import normalize_date
+from pandas.core.tools import datetimes as tools
+from pandas.core.tools.datetimes import normalize_date
 from pandas.compat import lmap
 from pandas.compat.numpy import np_array_datetime64_compat
 from pandas.core.dtypes.common import is_datetime64_ns_dtype

pandas/tests/frame/test_analytics.py

@@ -15,7 +15,7 @@
 
 import pandas as pd
 import pandas.io.parsers as parsers
-import pandas.tseries.tools as tools
+import pandas.core.tools.datetimes as tools
 import pandas.util.testing as tm
 
 import pandas.io.date_converters as conv

pandas/tests/indexes/datetimes/test_tools.py

@@ -38,7 +38,7 @@
 from pandas import date_range, to_datetime, to_timedelta, Timestamp
 import pandas.compat as compat
 from pandas.compat import range, lrange, string_types, PY36
-from pandas.tseries.tools import format as date_format
+from pandas.core.tools.datetimes import format as date_format
 
 import pandas.io.sql as sql
 from pandas.io.sql import read_sql_table, read_sql_query

pandas/tests/io/parser/parse_dates.py

@@ -4,7 +4,7 @@
 
 import pandas as pd
 import pandas.util.testing as tm
-from pandas.tseries.timedeltas import _coerce_scalar_to_timedelta_type as ct
+from pandas.core.tools.timedeltas import _coerce_scalar_to_timedelta_type as ct
 from pandas import (Timedelta, TimedeltaIndex, timedelta_range, Series,
                     to_timedelta, compat)
 from pandas._libs.tslib import iNaT, NaTType

pandas/tests/io/test_sql.py

@@ -204,7 +204,7 @@ def test_concat_empty_series_dtypes(self):
         self.assertEqual(result.ftype, 'object:dense')
 
     def test_combine_first_dt64(self):
-        from pandas.tseries.tools import to_datetime
+        from pandas.core.tools.datetimes import to_datetime
         s0 = to_datetime(Series(["2010", np.NaN]))
         s1 = to_datetime(Series([np.NaN, "2011"]))
         rs = s0.combine_first(s1)

pandas/tests/scalar/test_timedelta.py

@@ -379,7 +379,7 @@ def test_dt_accessor_api(self):
             self.assertFalse(hasattr(s, 'dt'))
 
     def test_sub_of_datetime_from_TimeSeries(self):
-        from pandas.tseries.timedeltas import to_timedelta
+        from pandas.core.tools.timedeltas import to_timedelta
         from datetime import datetime
         a = Timestamp(datetime(1993, 0o1, 0o7, 13, 30, 00))
         b = datetime(1993, 6, 22, 13, 30)

pandas/tests/series/test_combine_concat.py

@@ -7,7 +7,7 @@
                     date_range, period_range)
 
 import pandas.tseries.frequencies as frequencies
-from pandas.tseries.tools import to_datetime
+from pandas.core.tools.datetimes import to_datetime
 
 import pandas.tseries.offsets as offsets
 from pandas.core.indexes.period import PeriodIndex

pandas/tests/series/test_datetime_values.py

@@ -28,8 +28,9 @@
                                     QuarterEnd, BusinessMonthEnd, FY5253,
                                     Milli, Nano, Easter, FY5253Quarter,
                                     LastWeekOfMonth, CacheableOffset)
-from pandas.tseries.tools import (format, ole2datetime, parse_time_string,
-                                  to_datetime, DateParseError)
+from pandas.core.tools.datetimes import (
+    format, ole2datetime, parse_time_string,
+    to_datetime, DateParseError)
 import pandas.tseries.offsets as offsets
 from pandas.io.pickle import read_pickle
 from pandas._libs.tslib import normalize_date, NaT, Timestamp, Timedelta

pandas/tests/tseries/test_frequencies.py

@@ -7,7 +7,7 @@
 from pytz import NonExistentTimeError
 
 import pandas.util.testing as tm
-import pandas.tseries.tools as tools
+import pandas.core.tools.datetimes as tools
 import pandas.tseries.offsets as offsets
 from pandas.compat import lrange, zip
 from pandas.core.indexes.datetimes import bdate_range, date_range

pandas/tests/tseries/test_offsets.py

@@ -5,5 +5,4 @@
 # flake8: noqa
 
 from pandas.tseries.frequencies import infer_freq
-from pandas.tseries.timedeltas import to_timedelta
 import pandas.tseries.offsets as offsets

pandas/tests/tseries/test_timezones.py

@@ -4,7 +4,7 @@
 import numpy as np
 
 from pandas.core.dtypes.generic import ABCSeries, ABCDatetimeIndex, ABCPeriod
-from pandas.tseries.tools import to_datetime, normalize_date
+from pandas.core.tools.datetimes import to_datetime, normalize_date
 from pandas.core.common import AbstractMethodError
 
 # import after tools, dateutil check