@@ -1123,75 +1123,75 @@ def _get_join_indexers(left_keys, right_keys, sort=False, how='inner',
11231123
11241124
11251125def _restore_dropped_levels_multijoin (left , right , dropped_level_names ,
1126- join_idx , lidx , ridx ):
1126+ join_index , lindexer , rindexer ):
11271127 """
11281128 *this is an internal non-public method*
11291129
11301130 Returns the levels, labels and names of a multil-index to multi-index join.
11311131 Depending on the type of join, this method restores the appropriate
1132- dropped levels of the joined multi-index. The method relies on lidx, ridx
1132+ dropped levels of the joined multi-index. The method relies on lidx, rindexer
11331133 which hold the index positions of left and right, where a join was feasible
11341134
11351135 Parameters
11361136 ----------
1137- left : Index
1137+ left : MultiIndex
11381138 left index
1139- right : Index
1139+ right : MultiIndex
11401140 right index
11411141 dropped_level_names : str array
11421142 list of non-common levels
1143- join_idx : Index
1143+ join_index : MultiIndex
11441144 the index of the join between the common levels of left and right
1145- lidx : intp array
1145+ lindexer : intp array
11461146 left indexer
11471147 right : intp array
11481148 right indexer
11491149
11501150 Returns
11511151 -------
1152- levels : intp ndarray
1152+ levels : list of Index
11531153 levels of combined multiindexes
1154- labels : str array
1154+ labels : intp array
11551155 labels of combined multiindexes
11561156 names : str array
11571157 names of combined multiindexes
11581158
11591159 """
11601160
11611161 # Convert to 1 level multi-index if not
1162- if not isinstance (join_idx , MultiIndex ):
1163- levels = [join_idx .values ]
1164- labels = [list (range (join_idx .size ))]
1165- names = [join_idx .name ]
1166- join_idx = MultiIndex (levels = levels , labels = labels ,
1167- names = names , verify_integrity = False )
1168-
1169- join_levels = join_idx .levels
1170- join_labels = join_idx .labels
1171- join_names = join_idx .names
1172-
1173- # lidx and ridx hold the indexes where the join occured
1162+ if not isinstance (join_index , MultiIndex ):
1163+ levels = [join_index .values ]
1164+ labels = [list (range (join_index .size ))]
1165+ names = [join_index .name ]
1166+ join_index = MultiIndex (levels = levels , labels = labels ,
1167+ names = names , verify_integrity = False )
1168+
1169+ join_levels = join_index .levels
1170+ join_labels = join_index .labels
1171+ join_names = join_index .names
1172+
1173+ # lindexer and rindexer hold the indexes where the join occured
11741174 # for left and right respectively. If left (right) is None then
11751175 # the join occured on all indices of left (right)
1176- if lidx is None :
1177- lidx = range (left .size )
1176+ if lindexer is None :
1177+ lindexer = range (left .size )
11781178
1179- if ridx is None :
1180- ridx = range (right .size )
1179+ if rindexer is None :
1180+ rindexer = range (right .size )
11811181
11821182 # Iterate through the levels that must be restored
11831183 for dropped_level_name in dropped_level_names :
11841184 if dropped_level_name in left .names :
11851185 idx = left
1186- indexer = lidx
1186+ indexer = lindexer
11871187 else :
11881188 idx = right
1189- indexer = ridx
1189+ indexer = rindexer
11901190
11911191 # The index of the level name to be restored
11921192 name_idx = idx .names .index (dropped_level_name )
11931193
1194- restore_levels = idx .levels [name_idx ]. values
1194+ restore_levels = idx .levels [name_idx ]
11951195 # Inject -1 in the labels list where a join was not possible
11961196 # IOW indexer[i]=-1
11971197 labels = idx .labels [name_idx ]
0 commit comments