Merge pull request #6657 from rosnfeld/issue_6648

REGR: fixing Timestamp/Series subtraction, resolves #6648

Author: jreback

pandas/tseries/tests/test_tslib.py

@@ -5,12 +5,13 @@
 from pandas import tslib
 import datetime
 
-from pandas.core.api import Timestamp
+from pandas.core.api import Timestamp, Series
 from pandas.tslib import period_asfreq, period_ordinal
 from pandas.tseries.index import date_range
 from pandas.tseries.frequencies import get_freq
 from pandas import _np_version_under1p7
 import pandas.util.testing as tm
+from pandas.util.testing import assert_series_equal
 
 class TestTimestamp(tm.TestCase):
     def test_repr(self):
@@ -333,6 +334,15 @@ def test_timestamp_and_datetime(self):
         self.assertEqual((Timestamp(datetime.datetime(2013, 10, 13)) - datetime.datetime(2013, 10, 12)).days, 1)
         self.assertEqual((datetime.datetime(2013, 10, 12) - Timestamp(datetime.datetime(2013, 10, 13))).days, -1)
 
+    def test_timestamp_and_series(self):
+        timestamp_series = Series(date_range('2014-03-17', periods=2, freq='D', tz='US/Eastern'))
+        first_timestamp = timestamp_series[0]
+
+        if not _np_version_under1p7:
+            delta_series = Series([np.timedelta64(0, 'D'), np.timedelta64(1, 'D')])
+            assert_series_equal(timestamp_series - first_timestamp, delta_series)
+            assert_series_equal(first_timestamp - timestamp_series, -delta_series)
+
     def test_addition_subtraction_types(self):
         # Assert on the types resulting from Timestamp +/- various date/time objects
         datetime_instance = datetime.datetime(2014, 3, 4)

pandas/tslib.pyx

@@ -707,11 +707,12 @@ cdef class _Timestamp(datetime):
         return result
 
     def __sub__(self, other):
-        if isinstance(other, datetime):
-            return datetime.__sub__(self, other)
+        if is_timedelta64_object(other) or is_integer_object(other) \
+                or isinstance(other, timedelta) or hasattr(other, 'delta'):
+            neg_other = -other
+            return self + neg_other
 
-        neg_other = -other
-        return self + neg_other
+        return datetime.__sub__(self, other)
 
     cpdef _get_field(self, field):
         out = get_date_field(np.array([self.value], dtype=np.int64), field)