8000 Allow multiple lambdas in Groupby.aggregate by TomAugspurger · Pull Request #26905 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

Allow multiple lambdas in Groupby.aggregate #26905

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
merged 12 commits into from
Jun 27, 2019
Merged

Allow multiple lambdas in Groupby.aggregate #26905

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d877ae9
ENH
TomAugspurger May 31, 2019
41b6096
Merge remote-tracking branch 'upstream/master' into 26430-multiple-la…
TomAugspurger Jun 24, 2019
54c36a1
updates
TomAugspurger Jun 24, 2019
9c2bcf2
fix assert
TomAugspurger Jun 24, 2019
d549046
updates
TomAugspurger Jun 25, 2019
3ece0a5
fixups
TomAugspurger Jun 25, 2019
dde7610
fixup types
TomAugspurger Jun 25, 2019
b2947bd
Merge remote-tracking branch 'upstream/master' into 26430-multiple-la…
TomAugspurger Jun 26, 2019
6581abc
doc
TomAugspurger Jun 26, 2019
868cc60
Merge remote-tracking branch 'upstream/master' into 26430-multiple-la…
TomAugspurger Jun 27, 2019
be712d8
types
TomAugspurger Jun 27, 2019
5aa538d
Merge remote-tracking branch 'upstream/master' into 26430-multiple-la…
TomAugspurger Jun 27, 2019
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
Prev Previous commit
Next Next commit
updates 
* use functools.partial
* remove dead or
  • Loading branch information
@TomAugspurger
TomAugspurger committed Jun 25, 2019
commit d5490465dae7defe3f9f89d1e81afd588631cd9f
12 changes: 6 additions & 6 deletions pandas/core/groupby/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
These are user facing as the result of the ``df.groupby(...)`` operations,
which here returns a DataFrameGroupBy object.
"""

from collections import OrderedDict, abc, namedtuple
import copy
import functools
from functools import partial
from textwrap import dedent
import typing
Expand Down Expand Up @@ -1758,7 +1758,8 @@ def _managle_lambda_list(
mangled_aggfuncs = []
for aggfunc in aggfuncs:
if com.get_callable_name(aggfunc) == "<lambda>":
aggfunc = _make_lambda(aggfunc, i)
aggfunc = functools.partial(aggfunc)
aggfunc.__name__ = '<lambda_{}>'.format(i)
i += 1
mangled_aggfuncs.append(aggfunc)

Expand Down Expand Up @@ -1788,7 +1789,7 @@ def _maybe_mangle_lambdas(agg_spec):
'sum'

>>> _maybe_mangle_lambdas([lambda: 1, lambda: 2]) # doctest: +SKIP
[<function __main__.<lambda>()>,
[<function __main__.<lambda_0>,
<function pandas...._make_lambda.<locals>.f(*args, **kwargs)>]
"""
is_dict = is_dict_like(agg_spec)
Expand All @@ -1797,14 +1798,13 @@ def _maybe_mangle_lambdas(agg_spec):
mangled_aggspec = type(agg_spec)() # dict or OrderdDict

if is_dict:
for key in agg_spec:
aggfuncs = agg_spec[key]
for key, aggfuncs in agg_spec.items():
if is_list_like(aggfuncs) and not is_dict_like(aggfuncs):
mangled_aggfuncs = _managle_lambda_list(aggfuncs)
else:
mangled_aggfuncs = aggfuncs

mangled_aggspec[key] = mangled_aggfuncs or aggfuncs
mangled_aggspec[key] = mangled_aggfuncs
else:
mangled_aggspec = _managle_lambda_list(agg_spec)

Expand Down
0