Skip to content

Commit 44f52be

Browse files
committed
Fixed Jeff's comments
1 parent c0e06b8 commit 44f52be

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

doc/source/whatsnew/v0.21.0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Plotting
112112

113113
Groupby/Resample/Rolling
114114
^^^^^^^^^^^^^^^^^^^^^^^^
115-
- Bug in ``resample().size()``. Inconsistent return type on resample of empty DataFrame (:issue:`14962`)
115+
- Bug in ``DataFrame.resample().size()`` where an empty DataFrame did not return a Series (:issue:`14962`)
116116

117117

118118

pandas/core/resample.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,8 @@ def var(self, ddof=1, *args, **kwargs):
552552

553553
@Appender(GroupBy.size.__doc__)
554554
def size(self):
555-
# It 'seems' special and needs extra handling. GH14962
555+
# It's a special case as higher level does return
556+
# a copy of 0-len objects. GH14962
556557
result = self._downsample('size')
557558
if not len(self.ax) and isinstance(self._selected_obj, ABCDataFrame):
558559
result = pd.Series([], index=result.index, dtype='int64')

pandas/tests/test_resample.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -788,16 +788,14 @@ def test_resample_empty_dataframe(self):
788788
result = getattr(f.resample(freq), method)()
789789
if method != 'size':
790790
expected = f.copy()
791-
assert_type_equal = assert_frame_equal
792791
else:
793792
# GH14962
794793
expected = Series([])
795-
assert_type_equal = assert_series_equal
796794

797795
expected.index = f.index._shallow_copy(freq=freq)
798796
assert_index_equal(result.index, expected.index)
799797
assert result.index.freq == expected.index.freq
800-
assert_type_equal(result, expected, check_dtype=False)
798+
assert_almost_equal(result, expected, check_dtype=False)
801799

802800
# test size for GH13212 (currently stays as df)
803801

0 commit comments

Comments
 (0)