BUG:fixed inconsistent behavior of last_valid_index

closes #12800 closes #12834
pandas-dev · Apr 11, 2016 · b8ae20e · b8ae20e
1 parent e1aa2d9
commit b8ae20e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/doc/source/whatsnew/v0.18.1.txt b/doc/source/whatsnew/v0.18.1.txt
@@ -256,7 +256,7 @@ Bug Fixes
 
 
 - Bug in ``.str`` accessor methods may raise ``ValueError`` if input has ``name`` and the result is ``DataFrame`` or ``MultiIndex`` (:issue:`12617`)
-
+- Bug in ``DataFrame.last_valid_index()`` and ``DataFrame.first_valid_index()`` on empty frames (:issue:`12800`)
 
 
 - Bug in ``CategoricalIndex.get_loc`` returns different result from regular ``Index`` (:issue:`12531`)

diff --git a/pandas/core/frame.py b/pandas/core/frame.py
@@ -3766,12 +3766,18 @@ def first_valid_index(self):
         """
         Return label for first non-NA/null value
         """
+        if len(self) == 0:
+            return None
+
         return self.index[self.count(1) > 0][0]
 
     def last_valid_index(self):
         """
         Return label for last non-NA/null value
         """
+        if len(self) == 0:
+            return None
+
         return self.index[self.count(1) > 0][-1]
 
     # ----------------------------------------------------------------------

diff --git a/pandas/tests/frame/test_timeseries.py b/pandas/tests/frame/test_timeseries.py
@@ -336,3 +336,8 @@ def test_first_last_valid(self):
 
         index = frame.last_valid_index()
         self.assertEqual(index, frame.index[-6])
+
+        # GH12800
+        empty = DataFrame()
+        self.assertIsNone(empty.last_valid_index())
+        self.assertIsNone(empty.first_valid_index())
diff --git a/pandas/tests/series/test_timeseries.py b/pandas/tests/series/test_timeseries.py
@@ -19,7 +19,6 @@
 
 
 class TestSeriesTimeSeries(TestData, tm.TestCase):
-
     _multiprocess_can_split_ = True
 
     def test_shift(self):
@@ -222,6 +221,7 @@ def test_asof(self):
 
     def test_getitem_setitem_datetimeindex(self):
         from pandas import date_range
+
         N = 50
         # testing with timezone, GH #2785
         rng = date_range('1/1/1990', periods=N, freq='H', tz='US/Eastern')
@@ -304,6 +304,7 @@ def test_getitem_setitem_datetime_tz_pytz(self):
         from pytz import timezone as tz
 
         from pandas import date_range
+
         N = 50
         # testing with timezone, GH #2785
         rng = date_range('1/1/1990', periods=N, freq='H', tz='US/Eastern')
@@ -343,6 +344,7 @@ def test_getitem_setitem_datetime_tz_dateutil(self):
             x)  # handle special case for utc in dateutil
 
         from pandas import date_range
+
         N = 50
         # testing with timezone, GH #2785
         rng = date_range('1/1/1990', periods=N, freq='H', tz='US/Eastern')
@@ -372,6 +374,7 @@ def test_getitem_setitem_datetime_tz_dateutil(self):
 
     def test_getitem_setitem_periodindex(self):
         from pandas import period_range
+
         N = 50
         rng = period_range('1/1/1990', periods=N, freq='H')
         ts = Series(np.random.randn(N), index=rng)
@@ -460,6 +463,7 @@ def test_asof_periodindex(self):
 
     def test_asof_more(self):
         from pandas import date_range
+
         s = Series([nan, nan, 1, 2, nan, nan, 3, 4, 5],
                    index=date_range('1/1/2000', periods=9))
 
@@ -605,6 +609,11 @@ def test_first_last_valid(self):
         self.assertIsNone(ser.last_valid_index())
         self.assertIsNone(ser.first_valid_index())
 
+        # GH12800
+        empty = Series()
+        self.assertIsNone(empty.last_valid_index())
+        self.assertIsNone(empty.first_valid_index())
+
     def test_mpl_compat_hack(self):
         result = self.ts[:, np.newaxis]
         expected = self.ts.values[:, np.newaxis]