Fix Series timedelta64 // timedelta

pandas-dev · jreback · Dec 31, 2017 · Dec 19, 2017 · Dec 19, 2017 · Dec 19, 2017
commit 1eab96ff6cf0a26b971b4ba68a3831c1129a0b62
diff --git a/doc/source/whatsnew/v0.22.0.txt b/doc/source/whatsnew/v0.22.0.txt
@@ -346,3 +346,4 @@ Other
 ^^^^^
 
 - Improved error message when attempting to use a Python keyword as an identifier in a ``numexpr`` backed query (:issue:`18221`)
+- Bug in :func:`Series.__floordiv__`  and :func:`Series.__rfloordiv__` where operating on a scalar ``timedelta`` raises an exception (:issue:`18824`)
diff --git a/pandas/core/ops.py b/pandas/core/ops.py
@@ -408,7 +408,7 @@ def _validate(self, lvalues, rvalues, name):
 
             if name not in ('__div__', '__rdiv__', '__truediv__',
                             '__rtruediv__', '__add__', '__radd__', '__sub__',
-                            '__rsub__'):
+                            '__rsub__', '__floordiv__', '__rfloordiv__'):
                 raise TypeError("can only operate on a timedeltas for addition"
                                 ", subtraction, and division, but the operator"
                                 " [{name}] was passed".format(name=name))
@@ -594,7 +594,8 @@ def _offset(lvalues, rvalues):
             # integer gets converted to timedelta in np < 1.6
             if ((self.is_timedelta_lhs and self.is_timedelta_rhs) and
                     not self.is_integer_rhs and not self.is_integer_lhs and
-                    self.name in ('__div__', '__truediv__')):
+                    self.name in ('__div__', '__truediv__',
+                                  '__floordiv__', '__rfloordiv__')):
                 self.dtype = 'float64'
                 self.fill_value = np.nan
                 lvalues = lvalues.astype(np.float64)

diff --git a/pandas/tests/series/test_operators.py b/pandas/tests/series/test_operators.py
@@ -977,15 +977,17 @@ def run_ops(ops, get_ser, test_ser):
         td1 = Series([timedelta(minutes=5, seconds=3)] * 3)
         td1.iloc[2] = np.nan
         td2 = timedelta(minutes=5, seconds=4)
-        ops = ['__mul__', '__floordiv__', '__pow__', '__rmul__',
-               '__rfloordiv__', '__rpow__']
+        ops = ['__mul__', '__pow__', '__rmul__',
+               '__rpow__']
         run_ops(ops, td1, td2)
         td1 + td2
         td2 + td1
         td1 - td2
         td2 - td1
         td1 / td2
         td2 / td1
+        tm.assert_series_equal(td1 // td2, Series([0, 0, np.nan]))
+        tm.assert_series_equal(td2 // td1, Series([1, 1, np.nan]))
 
         # ## datetime64 ###
         dt1 = Series([Timestamp('20111230'), Timestamp('20120101'),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -346,3 +346,4 @@ Other
		^^^^^

		- Improved error message when attempting to use a Python keyword as an identifier in a ``numexpr`` backed query (:issue:`18221`)
		- Bug in :func:`Series.__floordiv__` and :func:`Series.__rfloordiv__` where operating on a scalar ``timedelta`` raises an exception (:issue:`18824`)
Copy link Contributor jreback Dec 20, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. don't put things in Other. This is conversion. Also note that a floordiv of scalar / Series was incorrect before. Copy link Contributor jreback Dec 20, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. verify that we have a doc example in timedelta.rst as well. Copy link Member Author jbrockmendel Dec 20, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Also note that a floordiv of scalar / Series was incorrect before. Something other than the mention of `Series.__rfloordiv__`?