File tree 5 files changed +8
-17
lines changed
5 files changed +8
-17
lines changed Original file line number Diff line number Diff line change 2
2
_new_Index ,
3
3
_ensure_index ,
4
4
_ensure_index_from_sequences ,
5
- _get_na_value ,
6
5
InvalidIndexError ) # noqa
7
6
from pandas .core .indexes .category import CategoricalIndex # noqa
8
7
from pandas .core .indexes .multi import MultiIndex # noqa
25
24
'InvalidIndexError' , 'TimedeltaIndex' ,
26
25
'PeriodIndex' , 'DatetimeIndex' ,
27
26
'_new_Index' , 'NaT' ,
28
- '_ensure_index' , '_ensure_index_from_sequences' , '_get_na_value' ,
27
+ '_ensure_index' , '_ensure_index_from_sequences' ,
29
28
'_get_combined_index' ,
30
29
'_get_objs_combined_axis' , '_union_indexes' ,
31
30
'_get_consensus_names' ,
Original file line number Diff line number Diff line change @@ -2098,7 +2098,7 @@ def asof(self, label):
2098
2098
try :
2099
2099
loc = self .get_loc (label , method = 'pad' )
2100
2100
except KeyError :
2101
- return _get_na_value ( self .dtype )
2101
+ return self ._na_value
2102
2102
else :
2103
2103
if isinstance (loc , slice ):
2104
2104
loc = loc .indices (len (self ))[- 1 ]
@@ -4316,12 +4316,6 @@ def _ensure_index(index_like, copy=False):
4316
4316
return Index (index_like )
4317
4317
4318
4318
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
-
4325
4319
def _ensure_has_len (seq ):
4326
4320
"""If seq is an iterator, put its values into a list."""
4327
4321
try :
Original file line number Diff line number Diff line change 34
34
35
35
from pandas .core .indexes .base import (
36
36
Index , _ensure_index ,
37
- _get_na_value , InvalidIndexError ,
37
+ InvalidIndexError ,
38
38
_index_shared_docs )
39
39
from pandas .core .indexes .frozen import (
40
40
FrozenNDArray , FrozenList , _ensure_frozen )
@@ -804,7 +804,7 @@ def values(self):
804
804
elif box :
805
805
taken = algos .take_1d (lev ._box_values (lev ._ndarray_values ),
806
806
lab ,
807
- fill_value = _get_na_value ( lev .dtype . type ) )
807
+ fill_value = lev ._na_value )
808
808
else :
809
809
taken = algos .take_1d (np .asarray (lev ._values ), lab )
810
810
values .append (taken )
Original file line number Diff line number Diff line change 29
29
import pandas .core .algorithms as algos
30
30
from pandas ._libs import algos as _algos , reshape as _reshape
31
31
32
- from pandas .core .index import Index , MultiIndex , _get_na_value
32
+ from pandas .core .index import Index , MultiIndex
33
33
34
34
35
35
class _Unstacker (object ):
@@ -260,7 +260,7 @@ def get_new_columns(self):
260
260
return self .removed_level
261
261
262
262
lev = self .removed_level
263
- return lev .insert (0 , _get_na_value ( lev .dtype . type ) )
263
+ return lev .insert (0 , lev ._na_value )
264
264
265
265
stride = len (self .removed_level ) + self .lift
266
266
width = len (self .value_columns )
@@ -299,7 +299,7 @@ def get_new_index(self):
299
299
if len (self .new_index_levels ) == 1 :
300
300
lev , lab = self .new_index_levels [0 ], result_labels [0 ]
301
301
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 )
303
303
return lev .take (lab )
304
304
305
305
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):
1261
1261
-------
1262
1262
nobs : int or Series (if level specified)
1263
1263
"""
1264
- from pandas .core .index import _get_na_value
1265
-
1266
1264
if level is None :
1267
1265
return notna (com ._values_from_object (self )).sum ()
1268
1266
@@ -1275,7 +1273,7 @@ def count(self, level=None):
1275
1273
mask = lab == - 1
1276
1274
if mask .any ():
1277
1275
lab [mask ] = cnt = len (lev )
1278
- lev = lev .insert (cnt , _get_na_value ( lev .dtype . type ) )
1276
+ lev = lev .insert (cnt , lev ._na_value )
1279
1277
1280
1278
obs = lab [notna (self .values )]
1281
1279
out = np .bincount (obs , minlength = len (lev ) or None )
You can’t perform that action at this time.
0 commit comments