try to solve in to_timestamp and move tests

Author: reidy-p

pandas/core/indexes/period.py

@@ -633,8 +633,7 @@ def start_time(self):
 
     @property
     def end_time(self):
-        data = (self + 1).start_time.values.astype(int) - 1
-        return DatetimeIndex(data=data)
+        return self.to_timestamp(how='end')
 
     def _mpl_repr(self):
         # how to represent ourselves to matplotlib
@@ -666,7 +665,16 @@ def to_timestamp(self, freq=None, how='start'):
         base, mult = _gfc(freq)
         new_data = self.asfreq(freq, how)
 
-        new_data = period.periodarr_to_dt64arr(new_data._values, base)
+        end = how == 'E'
+        if end:
+            indexer = np.where(new_data.notnull())
+            # move forward one period
+            new_data._values[indexer] += 1
+            new_data = period.periodarr_to_dt64arr(new_data._values, base)
+            # subtract one nanosecond
+            new_data[indexer] -= 1
+        else:
+            new_data = period.periodarr_to_dt64arr(new_data._values, base)
         return DatetimeIndex(new_data, freq='infer', name=self.name)
 
     def _maybe_convert_timedelta(self, other):

pandas/tests/indexes/period/test_period.py

@@ -465,26 +465,6 @@ def test_end_time(self):
         expected_index = expected_index.shift(1, freq='D').shift(-1, freq='ns')
         tm.assert_index_equal(index.end_time, expected_index)
 
-    @pytest.mark.parametrize('input_vals', [
-        [Period('2016-01', freq='M'), Period('2016-02', freq='M')],
-        [Period('2016-01-01', freq='D'), Period('2016-01-02', freq='D')],
-        [Period('2016-01-01 00:00:00', freq='H'),
-         Period('2016-01-01 01:00:00', freq='H')],
-        [Period('2016-01-01 00:00:00', freq='M'),
-         Period('2016-01-01 00:01:00', freq='M')],
-        [Period('2016-01-01 00:00:00', freq='S'),
-         Period('2016-01-01 00:00:01', freq='S')]
-    ])
-    def test_end_time_timevalues(self, input_vals):
-        # GH 17157
-        # Check that the time part of the Period is adjusted by end_time
-        # when using the dt accessor on a Series
-
-        s = Series(input_vals)
-        result = s.dt.end_time
-        expected = s.apply(lambda x: x.end_time)
-        tm.assert_series_equal(result, expected)
-
     def test_index_duplicate_periods(self):
         # monotonic
         idx = PeriodIndex([2000, 2007, 2007, 2009, 2009], freq='A-JUN')

pandas/tests/series/test_period.py

@@ -4,7 +4,7 @@
 import pandas.util.testing as tm
 import pandas.core.indexes.period as period
 from pandas import Series, period_range, DataFrame, Period
-
+import pytest
 
 def _permute(obj):
     return obj.take(np.random.permutation(len(obj)))
@@ -278,3 +278,23 @@ def test_truncate(self):
             pd.Period('2017-09-02')
         ])
         tm.assert_series_equal(result2, pd.Series([2], index=expected_idx2))
+
+    @pytest.mark.parametrize('input_vals', [
+        [Period('2016-01', freq='M'), Period('2016-02', freq='M')],
+        [Period('2016-01-01', freq='D'), Period('2016-01-02', freq='D')],
+        [Period('2016-01-01 00:00:00', freq='H'),
+         Period('2016-01-01 01:00:00', freq='H')],
+        [Period('2016-01-01 00:00:00', freq='M'),
+         Period('2016-01-01 00:01:00', freq='M')],
+        [Period('2016-01-01 00:00:00', freq='S'),
+         Period('2016-01-01 00:00:01', freq='S')]
+    ])
+    def test_end_time_timevalues(self, input_vals):
+        # GH 17157
+        # Check that the time part of the Period is adjusted by end_time
+        # when using the dt accessor on a Series
+
+        s = Series(input_vals)
+        result = s.dt.end_time
+        expected = s.apply(lambda x: x.end_time)
+        tm.assert_series_equal(result, expected)