File tree Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Expand file tree Collapse file tree 2 files changed +10
-1
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ including other versions of pandas.
1313 Bug fixes
1414^^^^^^^^^
1515- Bug in :meth: `DataFrame.__getitem__ ` returning modified columns when called with ``slice `` in Python 3.12 (:issue: `57500 `)
16+ - Fix bug in :meth: `~DataFrame.groupby ` with ``None `` values with filter (:issue: `62501 `)
1617
1718.. ---------------------------------------------------------------------------
1819 .. _whatsnew_234.contributors :
Original file line number Diff line number Diff line change @@ -650,6 +650,8 @@ def get_converter(s):
650650 return lambda key : Timestamp (key )
651651 elif isinstance (s , np .datetime64 ):
652652 return lambda key : Timestamp (key ).asm8
653+ elif isna (s ):
654+ return lambda key : np .nan
653655 else :
654656 return lambda key : key
655657
@@ -684,11 +686,17 @@ def get_converter(s):
684686 for name in names
685687 )
686688
689+ elif any (isna (k ) for k in self .indices .keys ()):
690+ converters = [get_converter (name ) for name in names ]
691+ names = (converter (name ) for converter , name in zip (converters , names ))
692+
687693 else :
688694 converter = get_converter (index_sample )
689695 names = (converter (name ) for name in names )
690696
691- return [self .indices .get (name , []) for name in names ]
697+ indices = {np .nan if isna (k ) else k : v for k , v in self .indices .items ()}
698+
699+ return [indices .get (name , []) for name in names ]
692700
693701 @final
694702 def _get_index (self , name ):
You can’t perform that action at this time.
0 commit comments