Skip to content

Commit bb6d9b9

Browse files
committed
Fix DataFrame.resample bug for empty DataFrame #2640
1 parent 6e2b6ea commit bb6d9b9

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

pandas/tseries/resample.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ def resample(self, obj):
9494
else:
9595
obj = obj.to_timestamp(how=self.convention)
9696
rs = self._resample_timestamps(obj)
97+
elif len(axis) == 0:
98+
return obj
9799
else: # pragma: no cover
98100
raise TypeError('Only valid with DatetimeIndex or PeriodIndex')
99101

pandas/tseries/tests/test_resample.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,10 @@ def test_resample_empty(self):
442442
self.assert_(len(result) == 0)
443443
self.assert_(result.index.freqstr == 'A-DEC')
444444

445+
xp = DataFrame()
446+
rs = xp.resample('A')
447+
assert_frame_equal(xp, rs)
448+
445449
def test_weekly_resample_buglet(self):
446450
# #1327
447451
rng = date_range('1/1/2000', freq='B', periods=20)

0 commit comments

Comments
 (0)