pandas.index -> pandas.libs.index

Author: jreback

doc/source/whatsnew/v0.20.0.txt

@@ -466,6 +466,7 @@ If indicated, a deprecation warning will be issued if you reference that module.
     "pandas._sparse", "pandas.sparse.libsparse", ""
     "pandas._hash", "pandas.tools.libhash", ""
     "pandas.tslib", "pandas.libs.tslib", ""
+    "pandas.index", "pandas.libs.index", ""
 
 
 .. _whatsnew_0200.api_breaking.groupby_describe:

pandas/compat/pickle_compat.py

@@ -65,6 +65,8 @@ def load_reduce(self):
 
     # 12588, extensions moving
     ('pandas._sparse', 'BlockIndex'): ('pandas.sparse.libsparse', 'BlockIndex')
+    ('pandas.tslib', 'Timestamp'): ('pandas.libs.tslib', 'Timestamp'),
+    ('pandas.tslib', '__nat_unpickle'): ('pandas.libs.tslib', '__nat_unpickle')
     }
 
 

pandas/core/algorithms.py

@@ -6,7 +6,7 @@
 from warnings import warn
 import numpy as np
 
-from pandas import compat, lib, tslib, _np_version_under1p8
+from pandas import compat, lib, _np_version_under1p8
 from pandas.types.cast import _maybe_promote
 from pandas.types.generic import ABCSeries, ABCIndex
 from pandas.types.common import (is_unsigned_integer_dtype,
@@ -1411,7 +1411,7 @@ def diff(arr, n, axis=0):
     if needs_i8_conversion(arr):
         dtype = np.float64
         arr = arr.view('i8')
-        na = tslib.iNaT
+        na = iNaT
         is_timedelta = True
     elif issubclass(dtype.type, np.integer):
         dtype = np.float64

pandas/core/nanops.py

@@ -9,7 +9,8 @@
 except ImportError:  # pragma: no cover
     _USE_BOTTLENECK = False
 
-from pandas import compat, lib, algos, tslib
+from pandas import compat, lib, algos
+from pandas.libs import tslib
 from pandas.types.common import (_get_dtype,
                                  is_float, is_scalar,
                                  is_integer, is_complex, is_float_dtype,

pandas/core/ops.py

@@ -10,11 +10,11 @@
 import numpy as np
 import pandas as pd
 import datetime
-from pandas import compat, lib, tslib
-import pandas.index as _index
+from pandas import compat, lib
 from pandas.util.decorators import Appender
 import pandas.computation.expressions as expressions
 from pandas.lib import isscalar
+from pandas.libs import index as _index, tslib
 from pandas.libs.tslib import iNaT
 from pandas.compat import bind_method
 import pandas.core.missing as missing

pandas/core/series.py

@@ -69,8 +69,8 @@
 from pandas.util.validators import validate_bool_kwarg
 
 import pandas.lib as lib
-import pandas.libs.tslib as tslib
-import pandas.index as _index
+from pandas.libs import index as _index, tslib
+from pandas.libs.tslib import iNaT
 
 from pandas.core.config import get_option
 
@@ -733,7 +733,7 @@ def setitem(key, value):
                 elif is_timedelta64_dtype(self.dtype):
                     # reassign a null value to iNaT
                     if isnull(value):
-                        value = tslib.iNaT
+                        value = iNaT
 
                         try:
                             self.index._engine.set_value(self._values, key,

pandas/indexes/base.py

@@ -3,11 +3,10 @@
 import operator
 
 import numpy as np
-import pandas.libs.tslib as tslib
+from pandas.libs import index as _index, tslib
 import pandas.lib as lib
 import pandas._join as _join
 import pandas.algos as _algos
-import pandas.index as _index
 from pandas.lib import Timestamp, Timedelta, is_datetime_array
 
 from pandas.compat import range, u

pandas/indexes/category.py

@@ -1,5 +1,5 @@
 import numpy as np
-import pandas.index as _index
+import pandas.libs.index as _index
 
 from pandas import compat
 from pandas.compat.numpy import function as nv

pandas/indexes/multi.py

@@ -7,7 +7,7 @@
 
 import numpy as np
 import pandas.lib as lib
-import pandas.index as _index
+import pandas.libs.index as _index
 from pandas.lib import Timestamp
 
 from pandas.compat import range, zip, lrange, lzip, map

pandas/indexes/numeric.py

@@ -2,7 +2,7 @@
 import pandas.lib as lib
 import pandas._join as _join
 import pandas.algos as _algos
-import pandas.index as _index
+from pandas.libs import index as _index
 
 from pandas.types.common import (is_dtype_equal, pandas_dtype,
                                  is_float_dtype, is_object_dtype,

pandas/indexes/range.py

@@ -2,7 +2,7 @@
 import operator
 
 import numpy as np
-import pandas.index as _index
+import pandas.libs.index as _index
 
 from pandas.types.common import (is_integer,
                                  is_scalar,

pandas/index.pyx renamed to pandas/libs/index.pyx

@@ -15,8 +15,8 @@ cimport util
 
 import numpy as np
 
-cimport libs.tslib
-from hashtable cimport *
+cimport tslib
+from ..hashtable cimport *
 from pandas import algos, hashtable as _hash
 from pandas.libs import tslib
 from pandas.libs.tslib import Timestamp, Timedelta

pandas/sparse/series.py

@@ -20,7 +20,7 @@
 from pandas.core import generic
 import pandas.core.common as com
 import pandas.core.ops as ops
-import pandas.index as _index
+import pandas.libs.index as _index
 from pandas.util.decorators import Appender
 
 from pandas.sparse.array import (make_sparse, _sparse_array_op, SparseArray,

pandas/src/inference.pyx

@@ -1,7 +1,7 @@
 import sys
 from decimal import Decimal
 cimport util
-from tslib import NaT, get_timezone
+from libs.tslib import NaT, get_timezone
 from datetime import datetime, timedelta
 iNaT = util.get_nat()
 

pandas/src/period.pyx

@@ -474,7 +474,7 @@ def extract_ordinals(ndarray[object] values, freq):
         p = values[i]
 
         if is_null_datetimelike(p):
-            ordinals[i] = tslib.iNaT
+            ordinals[i] = iNaT
         else:
             try:
                 ordinals[i] = p.ordinal
@@ -485,9 +485,9 @@ def extract_ordinals(ndarray[object] values, freq):
 
             except AttributeError:
                 p = Period(p, freq=freq)
-                if p is tslib.NaT:
+                if p is NaT:
                     # input may contain NaT-like string
-                    ordinals[i] = tslib.iNaT
+                    ordinals[i] = iNaT
                 else:
                     ordinals[i] = p.ordinal
 
@@ -716,8 +716,8 @@ cdef class _Period(object):
         """
         Fast creation from an ordinal and freq that are already validated!
         """
-        if ordinal == tslib.iNaT:
-            return tslib.NaT
+        if ordinal == iNaT:
+            return NaT
         else:
             self = _Period.__new__(cls)
             self.ordinal = ordinal
@@ -730,7 +730,7 @@ cdef class _Period(object):
                 msg = _DIFFERENT_FREQ.format(self.freqstr, other.freqstr)
                 raise IncompatibleFrequency(msg)
             return PyObject_RichCompareBool(self.ordinal, other.ordinal, op)
-        elif other is tslib.NaT:
+        elif other is NaT:
             return _nat_scalar_rules[op]
         # index/series like
         elif hasattr(other, '_typ'):
@@ -776,8 +776,8 @@ cdef class _Period(object):
                                   offsets.Tick, offsets.DateOffset,
                                   Timedelta)):
                 return self._add_delta(other)
-            elif other is tslib.NaT:
-                return tslib.NaT
+            elif other is NaT:
+                return NaT
             elif lib.is_integer(other):
                 ordinal = self.ordinal + other * self.freq.n
                 return Period(ordinal=ordinal, freq=self.freq)
@@ -808,8 +808,8 @@ cdef class _Period(object):
             else:  # pragma: no cover
                 return NotImplemented
         elif isinstance(other, Period):
-            if self is tslib.NaT:
-                return tslib.NaT
+            if self is NaT:
+                return NaT
             return NotImplemented
         else:
             return NotImplemented
@@ -1164,7 +1164,7 @@ class Period(_Period):
             if (year is None and month is None and
                         quarter is None and day is None and
                         hour is None and minute is None and second is None):
-                ordinal = tslib.iNaT
+                ordinal = iNaT
             else:
                 if freq is None:
                     raise ValueError("If value is None, freq cannot be None")
@@ -1190,7 +1190,7 @@ class Period(_Period):
                 ordinal = converted.ordinal
 
         elif is_null_datetimelike(value) or value in tslib._nat_strings:
-            ordinal = tslib.iNaT
+            ordinal = iNaT
 
         elif isinstance(value, compat.string_types) or lib.is_integer(value):
             if lib.is_integer(value):

pandas/src/ujson/python/objToJSON.c

@@ -180,7 +180,7 @@ void initObjToJSON(void)
         Py_DECREF(mod_pandas);
     }
 
-    mod_tslib = PyImport_ImportModule("pandas.tslib");
+    mod_tslib = PyImport_ImportModule("pandas.libs.tslib");
     if (mod_tslib) {
         cls_nat = (PyTypeObject *)PyObject_GetAttrString(mod_tslib, "NaTType");
         Py_DECREF(mod_tslib);

pandas/tests/api/test_api.py

@@ -38,7 +38,7 @@ class TestPDApi(Base, tm.TestCase):
 
     # top-level packages that are c-imports, should rename to _*
     # to avoid naming conflicts
-    lib_to_rename = ['algos', 'hashtable', 'lib', 'index']
+    lib_to_rename = ['algos', 'hashtable', 'lib']
 
     # these are already deprecated; awaiting removal
     deprecated_modules = ['stats', 'datetools', 'parser', 'json']

pandas/tests/frame/test_indexing.py

@@ -18,6 +18,7 @@
                     date_range)
 import pandas as pd
 
+from pandas.libs.tslib import iNaT
 from pandas.tseries.offsets import BDay
 from pandas.types.common import (is_float_dtype,
                                  is_integer,
@@ -1491,8 +1492,7 @@ def test_setitem_single_column_mixed_datetime(self):
         assert_series_equal(result, expected)
 
         # set an allowable datetime64 type
-        from pandas import tslib
-        df.loc['b', 'timestamp'] = tslib.iNaT
+        df.loc['b', 'timestamp'] = iNaT
         self.assertTrue(isnull(df.loc['b', 'timestamp']))
 
         # allow this syntax

pandas/tests/indexes/common.py

@@ -408,7 +408,7 @@ def test_numpy_argsort(self):
             # pandas compatibility input validation - the
             # rest already perform separate (or no) such
             # validation via their 'values' attribute as
-            # defined in pandas/indexes/base.py - they
+            # defined in pandas.indexes/base.py - they
             # cannot be changed at the moment due to
             # backwards compatibility concerns
             if isinstance(type(ind), (CategoricalIndex, RangeIndex)):

pandas/tests/indexes/datetimes/test_construction.py

@@ -2,8 +2,9 @@
 from datetime import timedelta
 
 import pandas as pd
-from pandas import tslib, offsets, lib
+from pandas import offsets, lib
 import pandas.util.testing as tm
+from pandas.libs import tslib
 from pandas.libs.tslib import OutOfBoundsDatetime
 from pandas import (DatetimeIndex, Index, Timestamp, datetime, date_range,
                     to_datetime)

pandas/tests/indexes/datetimes/test_datetime.py

@@ -117,7 +117,7 @@ def test_reindex_preserves_tz_if_target_is_empty_list_or_array(self):
 
     def test_time_loc(self):  # GH8667
         from datetime import time
-        from pandas.index import _SIZE_CUTOFF
+        from pandas.libs.index import _SIZE_CUTOFF
 
         ns = _SIZE_CUTOFF + np.array([-100, 100], dtype=np.int64)
         key = time(15, 11, 30)

pandas/tests/indexes/datetimes/test_tools.py

@@ -9,7 +9,7 @@
 from distutils.version import LooseVersion
 
 import pandas as pd
-from pandas import tslib
+from pandas.libs import tslib
 from pandas.tseries import tools
 from pandas.tseries.tools import normalize_date
 from pandas.compat import lmap

pandas/tests/indexes/period/test_indexing.py

@@ -4,8 +4,9 @@
 import pandas as pd
 from pandas.util import testing as tm
 from pandas.compat import lrange
+from pandas.libs import tslib
 from pandas import (PeriodIndex, Series, DatetimeIndex,
-                    period_range, Period, tslib, _np_version_under1p9)
+                    period_range, Period, _np_version_under1p9)
 
 
 class TestGetItem(tm.TestCase):

pandas/tests/indexes/timedeltas/test_construction.py

@@ -3,9 +3,8 @@
 
 import pandas as pd
 import pandas.util.testing as tm
-from pandas import TimedeltaIndex, timedelta_range, tslib, to_timedelta
-
-iNaT = tslib.iNaT
+from pandas import TimedeltaIndex, timedelta_range, to_timedelta
+from pandas.libs.tslib import iNaT
 
 
 class TestTimedeltaIndex(tm.TestCase):

pandas/tests/indexes/timedeltas/test_ops.py

@@ -8,8 +8,8 @@
 from pandas.util.testing import assert_series_equal, assert_frame_equal
 from pandas import (Series, Timedelta, DataFrame, Timestamp, TimedeltaIndex,
                     timedelta_range, date_range, DatetimeIndex, Int64Index,
-                    _np_version_under1p10, Float64Index, Index, tslib)
-
+                    _np_version_under1p10, Float64Index, Index)
+from pandas.libs.tslib import iNaT
 from pandas.tests.test_base import Ops
 
 
@@ -772,7 +772,7 @@ def test_nat_new(self):
         tm.assert_index_equal(result, exp)
 
         result = idx._nat_new(box=False)
-        exp = np.array([tslib.iNaT] * 5, dtype=np.int64)
+        exp = np.array([iNaT] * 5, dtype=np.int64)
         tm.assert_numpy_array_equal(result, exp)
 
     def test_shift(self):

pandas/tests/indexes/timedeltas/test_tools.py

@@ -4,8 +4,9 @@
 import pandas as pd
 import pandas.util.testing as tm
 from pandas.util.testing import assert_series_equal
-from pandas import (Series, Timedelta, to_timedelta, tslib, isnull,
+from pandas import (Series, Timedelta, to_timedelta, isnull,
                     TimedeltaIndex)
+from pandas.libs.tslib import iNaT
 
 
 class TestTimedeltas(tm.TestCase):
@@ -26,7 +27,7 @@ def conv(v):
 
         # empty string
         result = to_timedelta('', box=False)
-        self.assertEqual(result.astype('int64'), tslib.iNaT)
+        self.assertEqual(result.astype('int64'), iNaT)
 
         result = to_timedelta(['', ''])
         self.assertTrue(isnull(result).all())

pandas/tests/io/test_packers.py

@@ -22,7 +22,8 @@
 from pandas.tests.test_panel import assert_panel_equal
 
 import pandas
-from pandas import Timestamp, NaT, tslib
+from pandas import Timestamp, NaT
+from pandas.libs.tslib import iNaT
 
 nan = np.nan
 
@@ -373,7 +374,7 @@ def setUp(self):
         s.name = 'object'
         self.d['object'] = s
 
-        s = Series(tslib.iNaT, dtype='M8[ns]', index=range(5))
+        s = Series(iNaT, dtype='M8[ns]', index=range(5))
         self.d['date'] = s
 
         data = {