Skip to content

Commit

Permalink
fix raise of TypeError when subtracting timedelta array
Browse files Browse the repository at this point in the history
  • Loading branch information
illegalnumbers committed Jul 26, 2018
1 parent 716efd3 commit c6c5029
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 5 deletions.
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v0.24.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ Datetimelike
Timedelta
^^^^^^^^^

-
- Fixed bug where array of timestamp and deltas raised a TypeError: unsupported operand type(s) for -: ``numpy.ndarray`` and ``Timedelta`` (:issue:`21980`)
-
-

Expand Down
13 changes: 9 additions & 4 deletions pandas/_libs/tslibs/timedeltas.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -542,10 +542,15 @@ def _binary_op_method_timedeltalike(op, name):

elif hasattr(other, 'dtype'):
# nd-array like
if other.dtype.kind not in ['m', 'M']:
# raise rathering than letting numpy return wrong answer
try:
if other.dtype.kind in ['m', 'M']:
return op(self.to_timedelta64(), other)
elif other.dtype.kind == 'O':
return np.array([op(self, x) for x in other])
else:
return NotImplemented
except:
return NotImplemented
return op(self.to_timedelta64(), other)

elif not _validate_ops_compat(other):
return NotImplemented
Expand Down Expand Up @@ -929,7 +934,7 @@ cdef class _Timedelta(timedelta):
def nanoseconds(self):
"""
Return the number of nanoseconds (n), where 0 <= n < 1 microsecond.
Returns
-------
int
Expand Down
106 changes: 106 additions & 0 deletions pandas/tests/scalar/timedelta/test_arithmetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,80 @@ def test_td_rsub_numeric_raises(self):
with pytest.raises(TypeError):
2.0 - td

def test_td_sub_timedelta_timedeltalike_array(self):
# GH 21980
arr = np.array([Timestamp('20130101 9:01'),
Timestamp('20121230 9:02')])
exp = np.array([Timestamp('20121231 9:01'),
Timestamp('20121229 9:02')])
res = arr - pd.Timedelta('1D')
tm.assert_numpy_array_equal(res, exp)

def test_td_sub_timedelta_mixed_timedeltalike_array(self):
# GH 21980
now = pd.Timestamp.now()
arr = np.array([now,
pd.Timedelta('1D')])
exp = np.array([now - pd.Timedelta('1D'),
pd.Timedelta('0D')])
res = arr - pd.Timedelta('1D')
tm.assert_numpy_array_equal(res, exp)

def test_td_rsub_timedelta_timedeltalike_array(self):
# GH 21980
arr = np.array([Timestamp('20130101 9:01'),
Timestamp('20121230 9:02')])
with pytest.raises(TypeError):
# an timedelta - timestamp doesnt make sense
pd.Timedelta('1D') - arr

def test_td_rsub_timedelta_mixed_timedeltalike_array(self):
# GH 21980
now = pd.Timestamp.now()
arr = np.array([now,
pd.Timedelta('1D')])
with pytest.raises(TypeError):
# an timedelta - timestamp doesnt make sense
pd.Timedelta('1D') - arr

def test_td_add_timedelta_timedeltalike_array(self):
# GH 21980
arr = np.array([Timestamp('20130101 9:01'),
Timestamp('20121230 9:02')])
exp = np.array([Timestamp('20130102 9:01'),
Timestamp('20121231 9:02')])
res = arr + pd.Timedelta('1D')
tm.assert_numpy_array_equal(res, exp)

def test_td_add_timedelta_mixed_timedeltalike_array(self):
# GH 21980
now = pd.Timestamp.now()
arr = np.array([now,
pd.Timedelta('1D')])
exp = np.array([now + pd.Timedelta('1D'),
pd.Timedelta('2D')])
res = arr + pd.Timedelta('1D')
tm.assert_numpy_array_equal(res, exp)

def test_td_radd_timedelta_timedeltalike_array(self):
# GH 21980
arr = np.array([Timestamp('20130101 9:01'),
Timestamp('20121230 9:02')])
exp = np.array([Timestamp('20130102 9:01'),
Timestamp('20121231 9:02')])
res = pd.Timedelta('1D') + arr
tm.assert_numpy_array_equal(res, exp)

def test_td_radd_timedelta_mixed_timedeltalike_array(self):
# GH 21980
now = pd.Timestamp.now()
arr = np.array([now,
pd.Timedelta('1D')])
exp = np.array([now + pd.Timedelta('1D'),
pd.Timedelta('2D')])
res = pd.Timedelta('1D') + arr
tm.assert_numpy_array_equal(res, exp)


class TestTimedeltaMultiplicationDivision(object):
"""
Expand Down Expand Up @@ -616,3 +690,35 @@ def test_rdivmod_invalid(self):

with pytest.raises(TypeError):
divmod(np.array([22, 24]), td)

def test_td_div_timedelta_timedeltalike_array(self):
# GH 21980
arr = np.array([Timestamp('20130101 9:01'),
Timestamp('20121230 9:02')])

with pytest.raises(TypeError):
arr / pd.Timedelta('1D')

def test_td_rdiv_timedelta_mixed_timedeltalike_array(self):
# GH 21980
arr = np.array([pd.Timestamp.now(),
pd.Timedelta('1D')])

with pytest.raises(TypeError):
pd.Timedelta('1D') / arr

def test_td_mult_timedelta_mixed_timedeltalike_array(self):
# GH 21980
arr = np.array([pd.Timestamp.now(),
pd.Timedelta('1D')])

with pytest.raises(TypeError):
pd.Timedelta('1D') * arr

def test_td_rmult_timedelta_mixed_timedeltalike_array(self):
# GH 21980
arr = np.array([pd.Timestamp.now(),
pd.Timedelta('1D')])

with pytest.raises(TypeError):
arr * pd.Timedelta('1D')

0 comments on commit c6c5029

Please sign in to comment.