Skip to content

CLN: Apply.agg_list_like #53353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mroeschke merged 3 commits into from
May 24, 2023
Merged

CLN: Apply.agg_list_like #53353

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1b9e72
CLN: Apply.agg_list_like
topper-123 May 23, 2023
cfb5a22
some cleanups
topper-123 May 23, 2023
661eb4d
Merge branch 'main' into cln_agg_list_like
topper-123 May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions pandas/core/apply.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,9 @@ def agg_list_like(self) -> DataFrame | Series:
keys = []

is_groupby = isinstance(obj, (DataFrameGroupBy, SeriesGroupBy))
is_ser_or_df = isinstance(obj, (ABCDataFrame, ABCSeries))
this_args = [self.axis, *self.args] if is_ser_or_df else self.args

context_manager: ContextManager
if is_groupby:
# When as_index=False, we combine all results using indices
Expand All @@ -336,12 +339,7 @@ def agg_list_like(self) -> DataFrame | Series:
if selected_obj.ndim == 1:
for a in arg:
colg = obj._gotitem(selected_obj.name, ndim=1, subset=selected_obj)
if isinstance(colg, (ABCSeries, ABCDataFrame)):
new_res = colg.aggregate(
a, self.axis, *self.args, **self.kwargs
)
else:
new_res = colg.aggregate(a, *self.args, **self.kwargs)
new_res = colg.aggregate(a, *this_args, **self.kwargs)
results.append(new_res)

# make sure we find a good name
Expand All @@ -352,12 +350,7 @@ def agg_list_like(self) -> DataFrame | Series:
indices = []
for index, col in enumerate(selected_obj):
colg = obj._gotitem(col, ndim=1, subset=selected_obj.iloc[:, index])
if isinstance(colg, (ABCSeries, ABCDataFrame)):
new_res = colg.aggregate(
arg, self.axis, *self.args, **self.kwargs
)
else:
new_res = colg.aggregate(arg, *self.args, **self.kwargs)
new_res = colg.aggregate(arg, *this_args, **self.kwargs)
results.append(new_res)
indices.append(index)
keys = selected_obj.columns.take(indices)
Expand Down