fix lib.Timestamp imports

Author: jbrockmendel

pandas/core/computation/scope.py

@@ -48,7 +48,7 @@ def _raw_hex_id(obj):
 
 
 _DEFAULT_GLOBALS = {
-    'Timestamp': pandas._libs.lib.Timestamp,
+    'Timestamp': pandas._libs.tslib.Timestamp,
     'datetime': datetime.datetime,
     'True': True,
     'False': False,

pandas/core/generic.py

@@ -7216,9 +7216,9 @@ def describe_categorical_1d(data):
                 if is_datetime64_dtype(data):
                     asint = data.dropna().values.view('i8')
                     names += ['top', 'freq', 'first', 'last']
-                    result += [lib.Timestamp(top), freq,
-                               lib.Timestamp(asint.min()),
-                               lib.Timestamp(asint.max())]
+                    result += [tslib.Timestamp(top), freq,
+                               tslib.Timestamp(asint.min()),
+                               tslib.Timestamp(asint.max())]
                 else:
                     names += ['top', 'freq']
                     result += [top, freq]

pandas/core/internals.py

@@ -2651,7 +2651,7 @@ def _try_coerce_args(self, values, other):
             other = other.asi8
             other_mask = isna(other)
         elif isinstance(other, (np.datetime64, datetime, date)):
-            other = lib.Timestamp(other)
+            other = tslib.Timestamp(other)
             tz = getattr(other, 'tz', None)
 
             # test we can have an equal time zone
@@ -2670,7 +2670,7 @@ def _try_coerce_result(self, result):
             if result.dtype.kind in ['i', 'f', 'O']:
                 result = result.astype('M8[ns]')
         elif isinstance(result, (np.integer, np.float, np.datetime64)):
-            result = lib.Timestamp(result, tz=self.values.tz)
+            result = tslib.Timestamp(result, tz=self.values.tz)
         if isinstance(result, np.ndarray):
             # allow passing of > 1dim if its trivial
             if result.ndim > 1:

pandas/core/resample.py

@@ -24,7 +24,7 @@
 from pandas.compat.numpy import function as nv
 
 from pandas._libs import lib, tslib
-from pandas._libs.lib import Timestamp
+from pandas._libs.tslib import Timestamp
 from pandas._libs.tslibs.period import IncompatibleFrequency
 
 from pandas.util._decorators import Appender, Substitution

pandas/plotting/_converter.py

@@ -23,7 +23,7 @@
 
 from pandas.compat import lrange
 import pandas.compat as compat
-import pandas._libs.lib as lib
+from pandas._libs import tslib
 import pandas.core.common as com
 from pandas.core.index import Index
 
@@ -52,7 +52,7 @@
 
 def get_pairs():
     pairs = [
-        (lib.Timestamp, DatetimeConverter),
+        (tslib.Timestamp, DatetimeConverter),
         (Period, PeriodConverter),
         (pydt.datetime, DatetimeConverter),
         (pydt.date, DatetimeConverter),
@@ -312,7 +312,7 @@ def try_parse(values):
         if isinstance(values, (datetime, pydt.date)):
             return _dt_to_float_ordinal(values)
         elif isinstance(values, np.datetime64):
-            return _dt_to_float_ordinal(lib.Timestamp(values))
+            return _dt_to_float_ordinal(tslib.Timestamp(values))
         elif isinstance(values, pydt.time):
             return dates.date2num(values)
         elif (is_integer(values) or is_float(values)):

pandas/tests/indexes/datetimes/test_construction.py

@@ -537,7 +537,7 @@ def test_datetimeindex_constructor_misc(self):
         arr = [datetime(2005, 1, 1), '1/2/2005', '1/3/2005', '2005-01-04']
         idx2 = DatetimeIndex(arr)
 
-        arr = [lib.Timestamp(datetime(2005, 1, 1)), '1/2/2005', '1/3/2005',
+        arr = [tslib.Timestamp(datetime(2005, 1, 1)), '1/2/2005', '1/3/2005',
                '2005-01-04']
         idx3 = DatetimeIndex(arr)
 

pandas/tests/indexes/test_base.py

@@ -29,7 +29,7 @@
 from pandas.core.indexes.datetimes import _to_m8
 
 import pandas as pd
-from pandas._libs.lib import Timestamp
+from pandas._libs.tslib import Timestamp
 
 
 class TestIndex(Base):

pandas/tests/indexes/test_multi.py

@@ -19,7 +19,7 @@
 from pandas.core.dtypes.dtypes import CategoricalDtype
 from pandas.core.indexes.base import InvalidIndexError
 from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
-from pandas._libs.lib import Timestamp
+from pandas._libs.tslib import Timestamp
 
 import pandas.util.testing as tm
 

pandas/tests/indexes/test_numeric.py

@@ -13,7 +13,7 @@
 import pandas.util.testing as tm
 
 import pandas as pd
-from pandas._libs.lib import Timestamp
+from pandas._libs.tslib import Timestamp
 
 from pandas.tests.indexes.common import Base
 

pandas/tests/io/parser/common.py

@@ -11,7 +11,7 @@
 
 import pytest
 import numpy as np
-from pandas._libs.lib import Timestamp
+from pandas._libs.tslib import Timestamp
 
 import pandas as pd
 import pandas.util.testing as tm

pandas/tests/io/parser/converters.py

@@ -13,7 +13,7 @@
 import pandas as pd
 import pandas.util.testing as tm
 
-from pandas._libs.lib import Timestamp
+from pandas._libs.tslib import Timestamp
 from pandas import DataFrame, Index
 from pandas.compat import parse_date, StringIO, lmap
 

pandas/tests/io/parser/parse_dates.py

@@ -11,7 +11,7 @@
 import pytest
 import numpy as np
 from pandas._libs.tslibs import parsing
-from pandas._libs.lib import Timestamp
+from pandas._libs.tslib import Timestamp
 
 import pandas as pd
 import pandas.io.parsers as parsers

pandas/tests/io/parser/test_parsers.py

@@ -5,7 +5,7 @@
 
 from pandas import read_csv, read_table, DataFrame
 import pandas.core.common as com
-from pandas._libs.lib import Timestamp
+from pandas._libs.tslib import Timestamp
 from pandas.compat import StringIO
 
 from .common import ParserTests

pandas/tests/io/parser/usecols.py

@@ -11,7 +11,7 @@
 import pandas.util.testing as tm
 
 from pandas import DataFrame, Index
-from pandas._libs.lib import Timestamp
+from pandas._libs.tslib import Timestamp
 from pandas.compat import StringIO
 
 

pandas/tests/series/test_indexing.py

@@ -2707,7 +2707,7 @@ def test_fancy_getitem(self):
         assert s['1/2/2009'] == 48
         assert s['2009-1-2'] == 48
         assert s[datetime(2009, 1, 2)] == 48
-        assert s[lib.Timestamp(datetime(2009, 1, 2))] == 48
+        assert s[tslib.Timestamp(datetime(2009, 1, 2))] == 48
         pytest.raises(KeyError, s.__getitem__, '2009-1-3')
 
         assert_series_equal(s['3/6/2009':'2009-06-05'],