6
6
7
7
from typing import (
8
8
TYPE_CHECKING ,
9
- Any ,
10
9
Hashable ,
11
10
Iterator ,
11
+ cast ,
12
12
final ,
13
13
)
14
14
@@ -286,7 +286,7 @@ def ax(self) -> Index:
286
286
287
287
def _get_grouper (
288
288
self , obj : NDFrameT , validate : bool = True
289
- ) -> tuple [Any , ops .BaseGrouper , NDFrameT ]:
289
+ ) -> tuple [ops .BaseGrouper , NDFrameT ]:
290
290
"""
291
291
Parameters
292
292
----------
@@ -296,15 +296,11 @@ def _get_grouper(
296
296
297
297
Returns
298
298
-------
299
- a tuple of binner, grouper, obj (possibly sorted)
299
+ a tuple of grouper, obj (possibly sorted)
300
300
"""
301
301
self ._set_grouper (obj )
302
- # error: Value of type variable "NDFrameT" of "get_grouper" cannot be
303
- # "Optional[Any]"
304
- # error: Incompatible types in assignment (expression has type "BaseGrouper",
305
- # variable has type "None")
306
- self .grouper , _ , self .obj = get_grouper ( # type: ignore[type-var,assignment]
307
- self .obj ,
302
+ grouper , _ , obj = get_grouper (
303
+ cast (NDFrameT , self .obj ),
308
304
[self .key ],
309
305
axis = self .axis ,
310
306
level = self .level ,
@@ -313,9 +309,7 @@ def _get_grouper(
313
309
dropna = self .dropna ,
314
310
)
315
311
316
- # error: Incompatible return value type (got "Tuple[None, None, None]",
317
- # expected "Tuple[Any, BaseGrouper, NDFrameT]")
318
- return self .binner , self .grouper , self .obj # type: ignore[return-value]
312
+ return grouper , obj
319
313
320
314
@final
321
315
def _set_grouper (self , obj : NDFrame , sort : bool = False ) -> None :
@@ -506,7 +500,7 @@ def __init__(
506
500
# check again as we have by this point converted these
507
501
# to an actual value (rather than a pd.Grouper)
508
502
assert self .obj is not None # for mypy
509
- _ , newgrouper , newobj = self .grouping_vector ._get_grouper (
503
+ newgrouper , newobj = self .grouping_vector ._get_grouper (
510
504
self .obj , validate = False
511
505
)
512
506
self .obj = newobj
@@ -814,7 +808,7 @@ def get_grouper(
814
808
815
809
# a passed-in Grouper, directly convert
816
810
if isinstance (key , Grouper ):
817
- binner , grouper , obj = key ._get_grouper (obj , validate = False )
811
+ grouper , obj = key ._get_grouper (obj , validate = False )
818
812
if key .key is None :
819
813
return grouper , frozenset (), obj
820
814
else :
0 commit comments