From 9f00d608920b436a50fd3e23a3dc9cea266aae5f Mon Sep 17 00:00:00 2001 From: Tom Fleet Date: Wed, 1 Jul 2020 17:52:24 +0100 Subject: [PATCH 1/2] CLN: Removed unreached else block GH33478 Unreached else block in method _wrap_applied_output was removed. Local tests passed before and after change. --- pandas/core/groupby/generic.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pandas/core/groupby/generic.py b/pandas/core/groupby/generic.py index dab8475d9580c..f70ddb9001518 100644 --- a/pandas/core/groupby/generic.py +++ b/pandas/core/groupby/generic.py @@ -1373,10 +1373,6 @@ def _wrap_applied_output(self, keys, values, not_indexed_same=False): # of columns return self.obj._constructor_sliced(values, index=key_index) - else: - # Handle cases like BinGrouper - return self._concat_objects(keys, values, not_indexed_same=not_indexed_same) - def _transform_general( self, func, *args, engine="cython", engine_kwargs=None, **kwargs ): From 49f824f143203c25a06b9b574aea3546ed8dad68 Mon Sep 17 00:00:00 2001 From: Tom Fleet Date: Wed, 1 Jul 2020 19:51:45 +0100 Subject: [PATCH 2/2] CLN GH33478 Correct elif to else in _wrap_applied_output. Related to previous removal of unreached else block. Removal left an out of place elif, replaced with else. Local tests pass before/after --- pandas/core/groupby/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/groupby/generic.py b/pandas/core/groupby/generic.py index f70ddb9001518..6f956a3dcc9b6 100644 --- a/pandas/core/groupby/generic.py +++ b/pandas/core/groupby/generic.py @@ -1218,7 +1218,7 @@ def _wrap_applied_output(self, keys, values, not_indexed_same=False): return self.obj._constructor() elif isinstance(first_not_none, DataFrame): return self._concat_objects(keys, values, not_indexed_same=not_indexed_same) - elif self.grouper.groupings is not None: + else: if len(self.grouper.groupings) > 1: key_index = self.grouper.result_index