more checks and test cases

pandas-dev · jreback · Nov 29, 2018 · Nov 21, 2018 · Nov 21, 2018 · Nov 21, 2018
commit bd2ee969627a93ef32c8462ace74ff8539f24330
diff --git a/pandas/core/arrays/timedeltas.py b/pandas/core/arrays/timedeltas.py
@@ -165,6 +165,7 @@ def _simple_new(cls, values, freq=None, dtype=_TD_DTYPE):
     def __new__(cls, values, freq=None, dtype=_TD_DTYPE):
 
         freq, freq_infer = dtl.maybe_infer_freq(freq)
+        values, inferred_freq = sequence_to_td64ns(values)
 
         values = np.array(values, copy=False)
         if values.dtype == np.object_:
@@ -328,7 +329,9 @@ def _evaluate_with_timedelta_like(self, other, op):
     __rfloordiv__ = _wrap_tdi_op(ops.rfloordiv)
 
     def __truediv__(self, other):
-        # TODO: should we unbox zero_dim?
+        # TODO: Decimals?
+        other = lib.item_from_zerodim(other)
+
         if isinstance(other, (ABCSeries, ABCDataFrame, ABCIndexClass)):
             return NotImplemented
 
@@ -352,6 +355,13 @@ def __truediv__(self, other):
                 freq = self.freq.delta / other
             return type(self)(result, freq=freq)
 
+        if not hasattr(other, "dtype"):
+            # e.g. list, tuple
+            other = np.array(other)
+
+        if len(other) != len(self):
+            raise ValueError("Cannot divide vectors with unequal lengths")
+
         elif is_timedelta64_dtype(other):
             # let numpy handle it
             return self._data / other
@@ -371,6 +381,8 @@ def __truediv__(self, other):
             return type(self)(result)
 
     def __rtruediv__(self, other):
+        other = lib.item_from_zerodim(other)
+
         if isinstance(other, (ABCSeries, ABCDataFrame, ABCIndexClass)):
             return NotImplemented
 
@@ -385,6 +397,18 @@ def __rtruediv__(self, other):
             # otherwise, dispatch to Timedelta implementation
             return other / self._data
 
+        elif lib.is_scalar(other):
+            raise TypeError("Cannot divide {typ} by {cls}"
+                            .format(typ=type(other).__name__,
+                                    cls=type(self).__name__))
+
+        if not hasattr(other, "dtype"):
+            # e.g. list, tuple
+            other = np.array(other)
+
+        if len(other) != len(self):
+            raise ValueError("Cannot divide vectors with unequal lengths")
+
         elif is_timedelta64_dtype(other):
             # let numpy handle it
             return other / self._data

diff --git a/pandas/tests/arithmetic/test_timedelta64.py b/pandas/tests/arithmetic/test_timedelta64.py
@@ -1183,8 +1183,8 @@ def test_td64arr_div_tdlike_scalar_with_nat(self, two_hours,
 
     def test_td64arr_div_td64_ndarray(self, box_with_array):
         # GH#22631
-        rng = TimedeltaIndex(['1 days', pd.NaT, '2 days'], name='foo')
-        expected = pd.Float64Index([12, np.nan, 24], name='foo')
+        rng = TimedeltaIndex(['1 days', pd.NaT, '2 days'])
+        expected = pd.Float64Index([12, np.nan, 24])
 
         rng = tm.box_expected(rng, box_with_array)
         expected = tm.box_expected(expected, box_with_array)
@@ -1194,21 +1194,41 @@ def test_td64arr_div_td64_ndarray(self, box_with_array):
         tm.assert_equal(result, expected)
 
         result = rng / tm.box_expected(other, box_with_array)
-        tm.assert_equal(result, expected, check_names=False)
+        tm.assert_equal(result, expected)
 
         result = rng / other.astype(object)
         tm.assert_equal(result, expected)
 
+        result = rng / list(other)
+        tm.assert_equal(result, expected)
+
+        # reversed op
         expected = 1 / expected
         result = other / rng
         tm.assert_equal(result, expected)
 
         result = tm.box_expected(other, box_with_array) / rng
-        tm.assert_equal(result, expected, check_names=False)
+        tm.assert_equal(result, expected)
 
         result = other.astype(object) / rng
         tm.assert_equal(result, expected)
 
+        result = list(other) / rng
+        tm.assert_equal(result, expected)
+
+    def test_tdarr_div_length_mismatch(self, box_with_array):
+        rng = TimedeltaIndex(['1 days', pd.NaT, '2 days'])
+        mismatched = [1, 2, 3, 4]
+
+        rng = tm.box_expected(rng, box_with_array)
+        for obj in [mismatched, mismatched[:2]]:
+            # one shorter, one longer
+            for other in [obj, np.array(obj), pd.Index(obj)]:
+                with pytest.raises(ValueError):
+                    rng / other
+                with pytest.raises(ValueError):
+                    other / rng
+
     # ------------------------------------------------------------------
     # __floordiv__, __rfloordiv__