Skip to content

Commit c720531

Browse files
author
Jon M. Mease
committed
Fix for GH 14334
1 parent c7df3ba commit c720531

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

pandas/core/groupby.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -2232,7 +2232,10 @@ def __init__(self, index, grouper=None, obj=None, name=None, level=None,
22322232
self._group_index = level_index
22332233
self.grouper = level_index.take(labels)
22342234
else:
2235-
if isinstance(self.grouper, (list, tuple)):
2235+
if self.grouper is None and self.name is not None:
2236+
self.grouper = self.obj[self.name]
2237+
2238+
elif isinstance(self.grouper, (list, tuple)):
22362239
self.grouper = com._asarray_tuplesafe(self.grouper)
22372240

22382241
# a passed Categorical
@@ -2472,7 +2475,10 @@ def is_in_obj(gpr):
24722475
elif is_in_axis(gpr): # df.groupby('name')
24732476
in_axis, name, gpr = True, gpr, obj[gpr]
24742477
exclusions.append(name)
2475-
2478+
elif isinstance(gpr, Grouper) and gpr.key is not None:
2479+
# Add key to exclusions
2480+
exclusions.append(gpr.key)
2481+
in_axis, name = False, None
24762482
else:
24772483
in_axis, name = False, None
24782484

0 commit comments

Comments
 (0)