Skip to content

Commit 479b064

Browse files
fix raise of TypeError when subtracting timedelta array
closes pandas-dev#21980
1 parent e2e1a10 commit 479b064

File tree

3 files changed

+81
-4
lines changed

3 files changed

+81
-4
lines changed

doc/source/whatsnew/v0.24.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ Timedelta
594594
- Bug in multiplying a :class:`Series` with numeric dtype against a ``timedelta`` object (:issue:`22390`)
595595
- Bug in :class:`Series` with numeric dtype when adding or subtracting an an array or ``Series`` with ``timedelta64`` dtype (:issue:`22390`)
596596
- Bug in :class:`Index` with numeric dtype when multiplying or dividing an array with dtype ``timedelta64`` (:issue:`22390`)
597-
-
597+
- Fixed bug where subtracting :class:`Timedelta` from an object-dtyped array would raise ``TypeError`` (:issue:`21980`)
598598
-
599599
-
600600

pandas/_libs/tslibs/timedeltas.pyx

+5-3
Original file line numberDiff line numberDiff line change
@@ -541,10 +541,12 @@ def _binary_op_method_timedeltalike(op, name):
541541

542542
elif hasattr(other, 'dtype'):
543543
# nd-array like
544-
if other.dtype.kind not in ['m', 'M']:
545-
# raise rathering than letting numpy return wrong answer
544+
if other.dtype.kind in ['m', 'M']:
545+
return op(self.to_timedelta64(), other)
546+
elif other.dtype.kind == 'O':
547+
return np.array([op(self, x) for x in other])
548+
else:
546549
return NotImplemented
547-
return op(self.to_timedelta64(), other)
548550

549551
elif not _validate_ops_compat(other):
550552
return NotImplemented

pandas/tests/scalar/timedelta/test_arithmetic.py

+75
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,70 @@ def test_td_rsub_numeric_raises(self):
200200
with pytest.raises(TypeError):
201201
2.0 - td
202202

203+
def test_td_sub_timedeltalike_object_dtype_array(self):
204+
# GH 21980
205+
arr = np.array([Timestamp('20130101 9:01'),
206+
Timestamp('20121230 9:02')])
207+
exp = np.array([Timestamp('20121231 9:01'),
208+
Timestamp('20121229 9:02')])
209+
res = arr - pd.Timedelta('1D')
210+
tm.assert_numpy_array_equal(res, exp)
211+
212+
def test_td_sub_mixed_timedeltalike_object_dtype_array(self):
213+
# GH 21980
214+
now = pd.Timestamp.now()
215+
arr = np.array([now,
216+
pd.Timedelta('1D')])
217+
exp = np.array([now - pd.Timedelta('1D'),
218+
pd.Timedelta('0D')])
219+
res = arr - pd.Timedelta('1D')
220+
tm.assert_numpy_array_equal(res, exp)
221+
222+
def test_td_sub_mixed_most_timedeltalike_object_dtype_array(self):
223+
# GH 21980
224+
now = pd.Timestamp.now()
225+
arr = np.array([now,
226+
pd.Timedelta('1D'),
227+
np.timedelta64(2, 'h')])
228+
exp = np.array([now - pd.Timedelta('1D'),
229+
pd.Timedelta('0D'),
230+
np.timedelta64(2, 'h') - pd.Timedelta('1D')])
231+
res = arr - pd.Timedelta('1D')
232+
tm.assert_numpy_array_equal(res, exp)
233+
234+
@pytest.mark.parametrize('arr', [
235+
[Timestamp('20130101 9:01'),
236+
Timestamp('20121230 9:02')],
237+
[pd.Timestamp.now(),
238+
pd.Timedelta('1D')]
239+
])
240+
def test_td_rsub_timedeltalike_object_dtype_array(self,arr):
241+
# GH 21980
242+
with pytest.raises(TypeError):
243+
# an timedelta - timestamp doesnt make sense
244+
pd.Timedelta('1D') - arr
245+
246+
@pytest.mark.parametrize('op', [operator.add, ops.radd])
247+
def test_td_add_timedeltalike_object_dtype_array(self,op):
248+
# GH 21980
249+
arr = np.array([Timestamp('20130101 9:01'),
250+
Timestamp('20121230 9:02')])
251+
exp = np.array([Timestamp('20130102 9:01'),
252+
Timestamp('20121231 9:02')])
253+
res = op(arr, pd.Timedelta('1D'))
254+
tm.assert_numpy_array_equal(res, exp)
255+
256+
@pytest.mark.parametrize('op', [operator.add, ops.radd])
257+
def test_td_add_mixed_timedeltalike_object_dtype_array(self,op):
258+
# GH 21980
259+
now = pd.Timestamp.now()
260+
arr = np.array([now,
261+
pd.Timedelta('1D')])
262+
exp = np.array([now + pd.Timedelta('1D'),
263+
pd.Timedelta('2D')])
264+
res = op(arr, pd.Timedelta('1D'))
265+
tm.assert_numpy_array_equal(res, exp)
266+
203267

204268
class TestTimedeltaMultiplicationDivision(object):
205269
"""
@@ -616,3 +680,14 @@ def test_rdivmod_invalid(self):
616680

617681
with pytest.raises(TypeError):
618682
divmod(np.array([22, 24]), td)
683+
684+
@pytest.mark.parametrize('op', [operator.mul, ops.rmul, operator.truediv, ops.rdiv])
685+
@pytest.mark.parametrize('arr', [
686+
[Timestamp('20130101 9:01'),
687+
Timestamp('20121230 9:02')],
688+
[pd.Timestamp.now(),
689+
pd.Timedelta('1D')]
690+
])
691+
def test_td_op_timedelta_timedeltalike_array(self, op, arr):
692+
with pytest.raises(TypeError):
693+
arr * pd.Timedelta('1D')

0 commit comments

Comments
 (0)