fixups

Author: jbrockmendel

pandas/core/base.py

@@ -18,7 +18,8 @@
     is_datetime64tz_dtype, is_datetimelike, is_extension_array_dtype,
     is_extension_type, is_list_like, is_object_dtype, is_scalar)
 from pandas.core.dtypes.generic import (
-    ABCDataFrame, ABCDatetimeArray, ABCIndexClass, ABCSeries)
+    ABCDataFrame, ABCDatetimeArray, ABCIndexClass, ABCSeries,
+    ABCTimedeltaArray)
 from pandas.core.dtypes.missing import isna
 
 from pandas.core import algorithms, common as com
@@ -851,7 +852,7 @@ def array(self):
         result = self._values
 
         if not (is_extension_array_dtype(result.dtype)
-                or isinstance(result, ABCDatetimeArray)):
+                or isinstance(result, (ABCDatetimeArray, ABCTimedeltaArray))):
             # TODO: Should this be a DatetimeArray or PandasArray
             # for tz-naive data?
             # DatetimeArray is a bit strange, since tz-naive

pandas/core/indexes/datetimes.py

@@ -423,6 +423,7 @@ def __setstate__(self, state):
                 freq = None
 
             self._data = DatetimeArray(data, dtype=dtype, freq=freq)
+            self._freq = self._data._freq
             self._reset_identity()
 
         else:

pandas/tests/arithmetic/test_timedelta64.py

@@ -1476,7 +1476,7 @@ def test_tdi_rmul_arraylike(self, other, box_with_array):
 
         tdi = TimedeltaIndex(['1 Day'] * 10)
         expected = timedelta_range('1 days', '10 days')
-        expected._data._freq = None
+        expected._freq = None
 
         tdi = tm.box_expected(tdi, box)
         expected = tm.box_expected(expected, xbox)

pandas/tests/arrays/test_datetimes.py

@@ -136,7 +136,7 @@ def test_repeat_preserves_tz(self):
         repeated = arr.repeat([1, 1])
 
         # preserves tz and values, but not freq
-        expected = DatetimeArray(arr.asi8, freq=None, tz=arr.tz)
+        expected = DatetimeArray(arr.asi8, freq=None, dtype=arr.dtype)
         tm.assert_equal(repeated, expected)
 
     def test_value_counts_preserves_tz(self):

pandas/tests/arrays/test_timedeltas.py

@@ -21,11 +21,13 @@ def test_other_type_raises(self):
     def test_incorrect_dtype_raises(self):
         # TODO: why TypeError for 'category' but ValueError for i8?
         with pytest.raises(TypeError,
-                           match='data type "category" not understood'):
+                           match=r'category cannot be converted '
+                                 r'to timedelta64\[ns\]'):
             TimedeltaArray(np.array([1, 2, 3], dtype='i8'), dtype='category')
 
-        with pytest.raises(ValueError,
-                           match=r"Only timedelta64\[ns\] dtype is valid"):
+        with pytest.raises(TypeError,
+                           match=r"dtype int64 cannot be converted "
+                                 r"to timedelta64\[ns\]"):
             TimedeltaArray(np.array([1, 2, 3], dtype='i8'),
                            dtype=np.dtype(int))