Skip to content

Commit 87d32ae

Browse files
committed
Test fixup
1 parent 12ef132 commit 87d32ae

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

pandas/core/groupby/generic.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1716,7 +1716,9 @@ def _python_agg_general(self, func, *args, **kwargs):
17161716

17171717
if not len(obj.columns):
17181718
# e.g. test_margins_no_values_no_cols
1719-
return self._python_apply_general(f, self._selected_obj)
1719+
return obj._constructor(
1720+
index=self._grouper.result_index, columns=obj.columns
1721+
)
17201722

17211723
output: dict[int, ArrayLike] = {}
17221724
for idx, (name, ser) in enumerate(obj.items()):

pandas/tests/reshape/test_pivot.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,8 +1198,13 @@ def test_margins_no_values_no_cols(self, data):
11981198
result = data[["A", "B"]].pivot_table(
11991199
index=["A", "B"], aggfunc=len, margins=True
12001200
)
1201-
result_list = result.tolist()
1202-
assert sum(result_list[:-1]) == result_list[-1]
1201+
index = MultiIndex(
1202+
levels=[["bar", "foo", "All"], ["one", "two", ""]],
1203+
codes=[[0, 0, 1, 1, 2], [0, 1, 0, 1, 2]],
1204+
names=["A", "B"],
1205+
)
1206+
expected = DataFrame(index=index, columns=[])
1207+
tm.assert_frame_equal(result, expected)
12031208

12041209
def test_margins_no_values_two_rows(self, data):
12051210
# Regression test on pivot table: no values passed but rows are a

0 commit comments

Comments
 (0)