File tree Expand file tree Collapse file tree 5 files changed +8
-17
lines changed Expand file tree Collapse file tree 5 files changed +8
-17
lines changed Original file line number Diff line number Diff line change 22 _new_Index ,
33 _ensure_index ,
44 _ensure_index_from_sequences ,
5- _get_na_value ,
65 InvalidIndexError ) # noqa
76from pandas .core .indexes .category import CategoricalIndex # noqa
87from pandas .core .indexes .multi import MultiIndex # noqa
2524 'InvalidIndexError' , 'TimedeltaIndex' ,
2625 'PeriodIndex' , 'DatetimeIndex' ,
2726 '_new_Index' , 'NaT' ,
28- '_ensure_index' , '_ensure_index_from_sequences' , '_get_na_value' ,
27+ '_ensure_index' , '_ensure_index_from_sequences' ,
2928 '_get_combined_index' ,
3029 '_get_objs_combined_axis' , '_union_indexes' ,
3130 '_get_consensus_names' ,
Original file line number Diff line number Diff line change @@ -2098,7 +2098,7 @@ def asof(self, label):
20982098 try :
20992099 loc = self .get_loc (label , method = 'pad' )
21002100 except KeyError :
2101- return _get_na_value ( self .dtype )
2101+ return self ._na_value
21022102 else :
21032103 if isinstance (loc , slice ):
21042104 loc = loc .indices (len (self ))[- 1 ]
@@ -4316,12 +4316,6 @@ def _ensure_index(index_like, copy=False):
43164316 return Index (index_like )
43174317
43184318
4319- def _get_na_value (dtype ):
4320- if is_datetime64_any_dtype (dtype ) or is_timedelta64_dtype (dtype ):
4321- return libts .NaT
4322- return np .nan
4323-
4324-
43254319def _ensure_has_len (seq ):
43264320 """If seq is an iterator, put its values into a list."""
43274321 try :
Original file line number Diff line number Diff line change 3434
3535from pandas .core .indexes .base import (
3636 Index , _ensure_index ,
37- _get_na_value , InvalidIndexError ,
37+ InvalidIndexError ,
3838 _index_shared_docs )
3939from pandas .core .indexes .frozen import (
4040 FrozenNDArray , FrozenList , _ensure_frozen )
@@ -804,7 +804,7 @@ def values(self):
804804 elif box :
805805 taken = algos .take_1d (lev ._box_values (lev ._ndarray_values ),
806806 lab ,
807- fill_value = _get_na_value ( lev .dtype . type ) )
807+ fill_value = lev ._na_value )
808808 else :
809809 taken = algos .take_1d (np .asarray (lev ._values ), lab )
810810 values .append (taken )
Original file line number Diff line number Diff line change 2929import pandas .core .algorithms as algos
3030from pandas ._libs import algos as _algos , reshape as _reshape
3131
32- from pandas .core .index import Index , MultiIndex , _get_na_value
32+ from pandas .core .index import Index , MultiIndex
3333
3434
3535class _Unstacker (object ):
@@ -260,7 +260,7 @@ def get_new_columns(self):
260260 return self .removed_level
261261
262262 lev = self .removed_level
263- return lev .insert (0 , _get_na_value ( lev .dtype . type ) )
263+ return lev .insert (0 , lev ._na_value )
264264
265265 stride = len (self .removed_level ) + self .lift
266266 width = len (self .value_columns )
@@ -299,7 +299,7 @@ def get_new_index(self):
299299 if len (self .new_index_levels ) == 1 :
300300 lev , lab = self .new_index_levels [0 ], result_labels [0 ]
301301 if (lab == - 1 ).any ():
302- lev = lev .insert (len (lev ), _get_na_value ( lev .dtype . type ) )
302+ lev = lev .insert (len (lev ), lev ._na_value )
303303 return lev .take (lab )
304304
305305 return MultiIndex (levels = self .new_index_levels , labels = result_labels ,
Original file line number Diff line number Diff line change @@ -1261,8 +1261,6 @@ def count(self, level=None):
12611261 -------
12621262 nobs : int or Series (if level specified)
12631263 """
1264- from pandas .core .index import _get_na_value
1265-
12661264 if level is None :
12671265 return notna (com ._values_from_object (self )).sum ()
12681266
@@ -1275,7 +1273,7 @@ def count(self, level=None):
12751273 mask = lab == - 1
12761274 if mask .any ():
12771275 lab [mask ] = cnt = len (lev )
1278- lev = lev .insert (cnt , _get_na_value ( lev .dtype . type ) )
1276+ lev = lev .insert (cnt , lev ._na_value )
12791277
12801278 obs = lab [notna (self .values )]
12811279 out = np .bincount (obs , minlength = len (lev ) or None )
You can’t perform that action at this time.
0 commit comments