@@ -3258,27 +3258,27 @@ def droplevel(self, level=0):
3258
3258
# The two checks above guarantee that here self is a MultiIndex
3259
3259
3260
3260
new_levels = list (self .levels )
3261
- new_labels = list (self .labels )
3261
+ new_codes = list (self .codes )
3262
3262
new_names = list (self .names )
3263
3263
3264
3264
for i in levnums :
3265
3265
new_levels .pop (i )
3266
- new_labels .pop (i )
3266
+ new_codes .pop (i )
3267
3267
new_names .pop (i )
3268
3268
3269
3269
if len (new_levels ) == 1 :
3270
3270
3271
3271
# set nan if needed
3272
- mask = new_labels [0 ] == - 1
3273
- result = new_levels [0 ].take (new_labels [0 ])
3272
+ mask = new_codes [0 ] == - 1
3273
+ result = new_levels [0 ].take (new_codes [0 ])
3274
3274
if mask .any ():
3275
3275
result = result .putmask (mask , np .nan )
3276
3276
3277
3277
result .name = new_names [0 ]
3278
3278
return result
3279
3279
else :
3280
3280
from .multi import MultiIndex
3281
- return MultiIndex (levels = new_levels , labels = new_labels ,
3281
+ return MultiIndex (levels = new_levels , labels = new_codes ,
3282
3282
names = new_names , verify_integrity = False )
3283
3283
3284
3284
_index_shared_docs ['get_indexer' ] = """
@@ -4054,19 +4054,19 @@ def _get_leaf_sorter(labels):
4054
4054
left_indexer = None
4055
4055
join_index = left
4056
4056
else : # sort the leaves
4057
- left_indexer = _get_leaf_sorter (left .labels [:level + 1 ])
4057
+ left_indexer = _get_leaf_sorter (left .codes [:level + 1 ])
4058
4058
join_index = left [left_indexer ]
4059
4059
4060
4060
else :
4061
4061
left_lev_indexer = ensure_int64 (left_lev_indexer )
4062
4062
rev_indexer = lib .get_reverse_indexer (left_lev_indexer ,
4063
4063
len (old_level ))
4064
4064
4065
- new_lev_labels = algos .take_nd (rev_indexer , left .labels [level ],
4065
+ new_lev_labels = algos .take_nd (rev_indexer , left .codes [level ],
4066
4066
allow_fill = False )
4067
4067
4068
- new_labels = list (left .labels )
4069
- new_labels [level ] = new_lev_labels
4068
+ new_codes = list (left .codes )
4069
+ new_codes [level ] = new_lev_labels
4070
4070
4071
4071
new_levels = list (left .levels )
4072
4072
new_levels [level ] = new_level
@@ -4075,7 +4075,7 @@ def _get_leaf_sorter(labels):
4075
4075
left_indexer = np .arange (len (left ), dtype = np .intp )
4076
4076
mask = new_lev_labels != - 1
4077
4077
if not mask .all ():
4078
- new_labels = [lab [mask ] for lab in new_labels ]
4078
+ new_codes = [lab [mask ] for lab in new_codes ]
4079
4079
left_indexer = left_indexer [mask ]
4080
4080
4081
4081
else : # tie out the order with other
@@ -4086,31 +4086,31 @@ def _get_leaf_sorter(labels):
4086
4086
4087
4087
# missing values are placed first; drop them!
4088
4088
left_indexer = left_indexer [counts [0 ]:]
4089
- new_labels = [lab [left_indexer ] for lab in new_labels ]
4089
+ new_codes = [lab [left_indexer ] for lab in new_codes ]
4090
4090
4091
4091
else : # sort the leaves
4092
4092
mask = new_lev_labels != - 1
4093
4093
mask_all = mask .all ()
4094
4094
if not mask_all :
4095
- new_labels = [lab [mask ] for lab in new_labels ]
4095
+ new_codes = [lab [mask ] for lab in new_codes ]
4096
4096
4097
- left_indexer = _get_leaf_sorter (new_labels [:level + 1 ])
4098
- new_labels = [lab [left_indexer ] for lab in new_labels ]
4097
+ left_indexer = _get_leaf_sorter (new_codes [:level + 1 ])
4098
+ new_codes = [lab [left_indexer ] for lab in new_codes ]
4099
4099
4100
4100
# left_indexers are w.r.t masked frame.
4101
4101
# reverse to original frame!
4102
4102
if not mask_all :
4103
4103
left_indexer = mask .nonzero ()[0 ][left_indexer ]
4104
4104
4105
- join_index = MultiIndex (levels = new_levels , labels = new_labels ,
4105
+ join_index = MultiIndex (levels = new_levels , labels = new_codes ,
4106
4106
names = left .names , verify_integrity = False )
4107
4107
4108
4108
if right_lev_indexer is not None :
4109
4109
right_indexer = algos .take_nd (right_lev_indexer ,
4110
- join_index .labels [level ],
4110
+ join_index .codes [level ],
4111
4111
allow_fill = False )
4112
4112
else :
4113
- right_indexer = join_index .labels [level ]
4113
+ right_indexer = join_index .codes [level ]
4114
4114
4115
4115
if flip_order :
4116
4116
left_indexer , right_indexer = right_indexer , left_indexer
0 commit comments