20
20
import pandas .core .common as com
21
21
from pandas .core .common import (_values_from_object , is_float , is_integer ,
22
22
ABCSeries , _ensure_object , _ensure_int64 , is_bool_indexer ,
23
- is_list_like , is_bool_dtype , is_integer_dtype )
23
+ is_list_like , is_bool_dtype , is_null_slice , is_integer_dtype )
24
24
from pandas .core .config import get_option
25
25
from pandas .io .common import PerformanceWarning
26
26
@@ -720,7 +720,7 @@ def validate(v):
720
720
def is_int (v ):
721
721
return v is None or is_integer (v )
722
722
723
- is_null_slice = start is None and stop is None
723
+ is_null_slicer = start is None and stop is None
724
724
is_index_slice = is_int (start ) and is_int (stop )
725
725
is_positional = is_index_slice and not self .is_integer ()
726
726
@@ -742,7 +742,7 @@ def is_int(v):
742
742
if self .inferred_type == 'mixed-integer-float' :
743
743
raise
744
744
745
- if is_null_slice :
745
+ if is_null_slicer :
746
746
indexer = key
747
747
elif is_positional :
748
748
indexer = key
@@ -2615,7 +2615,7 @@ def get_value(self, series, key):
2615
2615
if not np .isscalar (key ):
2616
2616
raise InvalidIndexError
2617
2617
2618
- from pandas .core .indexing import _maybe_droplevels
2618
+ from pandas .core .indexing import maybe_droplevels
2619
2619
from pandas .core .series import Series
2620
2620
2621
2621
k = _values_from_object (key )
@@ -2626,7 +2626,7 @@ def get_value(self, series, key):
2626
2626
return new_values
2627
2627
2628
2628
new_index = self [loc ]
2629
- new_index = _maybe_droplevels (new_index , k )
2629
+ new_index = maybe_droplevels (new_index , k )
2630
2630
return Series (new_values , index = new_index , name = series .name )
2631
2631
2632
2632
def equals (self , other ):
@@ -3245,7 +3245,7 @@ def duplicated(self, take_last=False):
3245
3245
3246
3246
def get_value (self , series , key ):
3247
3247
# somewhat broken encapsulation
3248
- from pandas .core .indexing import _maybe_droplevels
3248
+ from pandas .core .indexing import maybe_droplevels
3249
3249
from pandas .core .series import Series
3250
3250
3251
3251
# Label-based
@@ -3257,7 +3257,7 @@ def _try_mi(k):
3257
3257
loc = self .get_loc (k )
3258
3258
new_values = series .values [loc ]
3259
3259
new_index = self [loc ]
3260
- new_index = _maybe_droplevels (new_index , k )
3260
+ new_index = maybe_droplevels (new_index , k )
3261
3261
return Series (new_values , index = new_index , name = series .name )
3262
3262
3263
3263
try :
@@ -4192,7 +4192,7 @@ def get_loc_level(self, key, level=0, drop_level=True):
4192
4192
-------
4193
4193
loc : int or slice object
4194
4194
"""
4195
- def _maybe_drop_levels (indexer , levels , drop_level ):
4195
+ def maybe_droplevels (indexer , levels , drop_level ):
4196
4196
if not drop_level :
4197
4197
return self [indexer ]
4198
4198
# kludgearound
@@ -4221,7 +4221,7 @@ def _maybe_drop_levels(indexer, levels, drop_level):
4221
4221
4222
4222
result = loc if result is None else result & loc
4223
4223
4224
- return result , _maybe_drop_levels (result , level , drop_level )
4224
+ return result , maybe_droplevels (result , level , drop_level )
4225
4225
4226
4226
level = self ._get_level_number (level )
4227
4227
@@ -4234,7 +4234,7 @@ def _maybe_drop_levels(indexer, levels, drop_level):
4234
4234
try :
4235
4235
if key in self .levels [0 ]:
4236
4236
indexer = self ._get_level_indexer (key , level = level )
4237
- new_index = _maybe_drop_levels (indexer , [0 ], drop_level )
4237
+ new_index = maybe_droplevels (indexer , [0 ], drop_level )
4238
4238
return indexer , new_index
4239
4239
except TypeError :
4240
4240
pass
@@ -4248,8 +4248,8 @@ def partial_selection(key, indexer=None):
4248
4248
indexer = self .get_loc (key )
4249
4249
ilevels = [i for i in range (len (key ))
4250
4250
if key [i ] != slice (None , None )]
4251
- return indexer , _maybe_drop_levels (indexer , ilevels ,
4252
- drop_level )
4251
+ return indexer , maybe_droplevels (indexer , ilevels ,
4252
+ drop_level )
4253
4253
4254
4254
if len (key ) == self .nlevels :
4255
4255
@@ -4307,11 +4307,11 @@ def partial_selection(key, indexer=None):
4307
4307
indexer = slice (None , None )
4308
4308
ilevels = [i for i in range (len (key ))
4309
4309
if key [i ] != slice (None , None )]
4310
- return indexer , _maybe_drop_levels (indexer , ilevels ,
4311
- drop_level )
4310
+ return indexer , maybe_droplevels (indexer , ilevels ,
4311
+ drop_level )
4312
4312
else :
4313
4313
indexer = self ._get_level_indexer (key , level = level )
4314
- return indexer , _maybe_drop_levels (indexer , [level ], drop_level )
4314
+ return indexer , maybe_droplevels (indexer , [level ], drop_level )
4315
4315
4316
4316
def _get_level_indexer (self , key , level = 0 ):
4317
4317
# return a boolean indexer or a slice showing where the key is
@@ -4388,8 +4388,6 @@ def get_locs(self, tup):
4388
4388
for passing to iloc
4389
4389
"""
4390
4390
4391
- from pandas .core .indexing import _is_null_slice
4392
-
4393
4391
# must be lexsorted to at least as many levels
4394
4392
if not self .is_lexsorted_for_tuple (tup ):
4395
4393
raise KeyError ('MultiIndex Slicing requires the index to be fully lexsorted'
@@ -4427,7 +4425,7 @@ def _convert_indexer(r):
4427
4425
else :
4428
4426
ranges .append (np .zeros (self .labels [i ].shape , dtype = bool ))
4429
4427
4430
- elif _is_null_slice (k ):
4428
+ elif is_null_slice (k ):
4431
4429
# empty slice
4432
4430
pass
4433
4431
0 commit comments