Skip to content

CLN: _wrap_applied_output #36260

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 3 commits into from
Sep 12, 2020
Merged

CLN: _wrap_applied_output #36260

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ea8208
CLN: _wrap_applied_output
rhshadrach Sep 10, 2020
8321172
Fixed error
rhshadrach Sep 10, 2020
32c6030
Added test
rhshadrach Sep 12, 2020
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
37 changes: 18 additions & 19 deletions pandas/core/groupby/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,16 +1203,27 @@ def _wrap_applied_output(self, keys, values, not_indexed_same=False):

values = [x if (x is not None) else backup for x in values]

v = values[0]

if not isinstance(v, (np.ndarray, Index, Series)) and self.as_index:
if isinstance(first_not_none, (np.ndarray, Index)):
# GH#1738: values is list of arrays of unequal lengths
# fall through to the outer else clause
# TODO: sure this is right? we used to do this
# after raising AttributeError above
return self.obj._constructor_sliced(
values, index=key_index, name=self._selection_name
)
elif not isinstance(first_not_none, Series):
# values are not series or array-like but scalars
# self._selection_name not passed through to Series as the
# result should not take the name of original selection
# of columns
return self.obj._constructor_sliced(values, index=key_index)
if self.as_index:
return self.obj._constructor_sliced(values, index=key_index)
else:
result = DataFrame(values, index=key_index, columns=[self._selection])
self._insert_inaxis_grouper_inplace(result)
return result
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like this line isnt covered (the equivalent line isnt covered in master, so not necessarily a problem for this PR). any chance it is unreachable and can be removed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added test to cover it.


if isinstance(v, Series):
else:
all_indexed_same = all_indexes_same((x.index for x in values))

# GH3596
Expand Down Expand Up @@ -1253,31 +1264,19 @@ def _wrap_applied_output(self, keys, values, not_indexed_same=False):

if self.axis == 0:
index = key_index
columns = v.index.copy()
columns = first_not_none.index.copy()
if columns.name is None:
# GH6124 - propagate name of Series when it's consistent
names = {v.name for v in values}
if len(names) == 1:
columns.name = list(names)[0]
else:
index = v.index
index = first_not_none.index
columns = key_index
stacked_values = stacked_values.T

result = self.obj._constructor(stacked_values, index=index, columns=columns)

elif not self.as_index:
# We add grouping column below, so create a frame here
result = DataFrame(values, index=key_index, columns=[self._selection])
else:
# GH#1738: values is list of arrays of unequal lengths
# fall through to the outer else clause
# TODO: sure this is right? we used to do this
# after raising AttributeError above
return self.obj._constructor_sliced(
values, index=key_index, name=self._selection_name
)

# if we have date/time like in the original, then coerce dates
# as we are stacking can easily have object dtypes here
so = self._selected_obj
Expand Down