Skip to content

REF/API: dont alter Grouper in _get_grouper #51145

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 8 additions & 14 deletions pandas/core/groupby/grouper.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

from typing import (
TYPE_CHECKING,
Any,
Hashable,
Iterator,
cast,
final,
)

Expand Down Expand Up @@ -286,7 +286,7 @@ def ax(self) -> Index:

def _get_grouper(
self, obj: NDFrameT, validate: bool = True
) -> tuple[Any, ops.BaseGrouper, NDFrameT]:
) -> tuple[ops.BaseGrouper, NDFrameT]:
"""
Parameters
----------
Expand All @@ -296,15 +296,11 @@ def _get_grouper(

Returns
-------
a tuple of binner, grouper, obj (possibly sorted)
a tuple of grouper, obj (possibly sorted)
"""
self._set_grouper(obj)
# error: Value of type variable "NDFrameT" of "get_grouper" cannot be
# "Optional[Any]"
# error: Incompatible types in assignment (expression has type "BaseGrouper",
# variable has type "None")
self.grouper, _, self.obj = get_grouper( # type: ignore[type-var,assignment]
self.obj,
grouper, _, obj = get_grouper(
cast(NDFrameT, self.obj),
[self.key],
axis=self.axis,
level=self.level,
Expand All @@ -313,9 +309,7 @@ def _get_grouper(
dropna=self.dropna,
)

# error: Incompatible return value type (got "Tuple[None, None, None]",
# expected "Tuple[Any, BaseGrouper, NDFrameT]")
return self.binner, self.grouper, self.obj # type: ignore[return-value]
return grouper, obj

@final
def _set_grouper(self, obj: NDFrame, sort: bool = False) -> None:
Expand Down Expand Up @@ -506,7 +500,7 @@ def __init__(
# check again as we have by this point converted these
# to an actual value (rather than a pd.Grouper)
assert self.obj is not None # for mypy
_, newgrouper, newobj = self.grouping_vector._get_grouper(
newgrouper, newobj = self.grouping_vector._get_grouper(
self.obj, validate=False
)
self.obj = newobj
Expand Down Expand Up @@ -814,7 +808,7 @@ def get_grouper(

# a passed-in Grouper, directly convert
if isinstance(key, Grouper):
binner, grouper, obj = key._get_grouper(obj, validate=False)
grouper, obj = key._get_grouper(obj, validate=False)
if key.key is None:
return grouper, frozenset(), obj
else:
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/resample.py
Original file line number Diff line number Diff line change
Expand Up @@ -1691,7 +1691,7 @@ def _get_resampler(self, obj, kind=None):
def _get_grouper(self, obj, validate: bool = True):
# create the resampler and return our binner
r = self._get_resampler(obj)
return r.binner, r.grouper, r.obj
return r.grouper, r.obj

def _get_time_bins(self, ax: DatetimeIndex):
if not isinstance(ax, DatetimeIndex):
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/resample/test_time_grouper.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def test_apply_iteration():
df = DataFrame({"open": 1, "close": 2}, index=ind)
tg = Grouper(freq="M")

_, grouper, _ = tg._get_grouper(df)
grouper, _ = tg._get_grouper(df)

# Errors
grouped = df.groupby(grouper, group_keys=False)
Expand Down