Skip to content

Commit 1cb1d55

Browse files
committed
1 parent ca8ef49 commit 1cb1d55

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

pandas/tests/tseries/test_resample.py

+8
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,14 @@ def test_resample_loffset_arg_type(self):
834834
assert_frame_equal(result_agg, expected)
835835
assert_frame_equal(result_how, expected)
836836

837+
def test_resample_empty_dataframe_with_size(self):
838+
# GH 14962
839+
df1 = pd.DataFrame(dict(a=range(100)),
840+
index=pd.date_range('1/1/2000', periods=100, freq="M"))
841+
df2 = df1[df1.a < 0]
842+
result = df2.resample("Q").size()
843+
assertIsInstance(result, pd.Series)
844+
837845

838846
class TestDatetimeIndex(Base, tm.TestCase):
839847
_index_factory = lambda x: date_range

pandas/tseries/resample.py

+4
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,10 @@ def _downsample(self, how, **kwargs):
700700
if not len(ax):
701701
# reset to the new freq
702702
obj = obj.copy()
703+
if how == "size" and isinstance(obj, pd.DataFrame):
704+
obj = obj.groupby(
705+
self.grouper, axis=self.axis).aggregate(how, **kwargs)
706+
703707
obj.index.freq = self.freq
704708
return obj
705709

0 commit comments

Comments
 (0)