Skip to content

Commit 411c740

Browse files
committed
MultiIndex.labels -> MulitIndex.codes
1 parent f77cc3d commit 411c740

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+3366
-553
lines changed

pandas/core/frame.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1941,7 +1941,7 @@ def to_panel(self):
19411941
selfsorted = self
19421942

19431943
major_axis, minor_axis = selfsorted.index.levels
1944-
major_labels, minor_labels = selfsorted.index.labels
1944+
major_codes, minor_codes = selfsorted.index.codes
19451945
shape = len(major_axis), len(minor_axis)
19461946

19471947
# preserve names, if any
@@ -1956,8 +1956,8 @@ def to_panel(self):
19561956

19571957
# create new manager
19581958
new_mgr = selfsorted._data.reshape_nd(axes=new_axes,
1959-
labels=[major_labels,
1960-
minor_labels],
1959+
labels=[major_codes,
1960+
minor_codes],
19611961
shape=shape,
19621962
ref_items=selfsorted.columns)
19631963

@@ -4330,7 +4330,7 @@ def _maybe_casted_values(index, labels=None):
43304330
if isinstance(self.index, MultiIndex):
43314331
names = [n if n is not None else ('level_%d' % i)
43324332
for (i, n) in enumerate(self.index.names)]
4333-
to_insert = lzip(self.index.levels, self.index.labels)
4333+
to_insert = lzip(self.index.levels, self.index.codes)
43344334
else:
43354335
default = 'index' if 'index' not in self else 'level_0'
43364336
names = ([default] if self.index.name is None
@@ -7251,8 +7251,9 @@ def _count_level(self, level, axis=0, numeric_only=False):
72517251
level = count_axis._get_level_number(level)
72527252

72537253
level_index = count_axis.levels[level]
7254-
labels = ensure_int64(count_axis.labels[level])
7255-
counts = lib.count_level_2d(mask, labels, len(level_index), axis=0)
7254+
level_codes = ensure_int64(count_axis.codes[level])
7255+
counts = lib.count_level_2d(mask, level_codes, len(level_index),
7256+
axis=0)
72567257

72577258
result = DataFrame(counts, index=level_index, columns=agg_axis)
72587259

pandas/core/groupby/generic.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1112,7 +1112,7 @@ def value_counts(self, normalize=False, sort=True, ascending=False,
11121112
lab = cut(Series(val), bins, include_lowest=True)
11131113
lev = lab.cat.categories
11141114
lab = lev.take(lab.cat.codes)
1115-
llab = lambda lab, inc: lab[inc]._multiindex.labels[-1]
1115+
llab = lambda lab, inc: lab[inc]._multiindex.codes[-1]
11161116

11171117
if is_interval_dtype(lab):
11181118
# TODO: should we do this inside II?
@@ -1163,7 +1163,7 @@ def value_counts(self, normalize=False, sort=True, ascending=False,
11631163
out, labels[-1] = out[sorter], labels[-1][sorter]
11641164

11651165
if bins is None:
1166-
mi = MultiIndex(levels=levels, labels=labels, names=names,
1166+
mi = MultiIndex(levels=levels, codes=labels, names=names,
11671167
verify_integrity=False)
11681168

11691169
if is_integer_dtype(out):
@@ -1194,7 +1194,7 @@ def value_counts(self, normalize=False, sort=True, ascending=False,
11941194
labels = list(map(lambda lab: np.repeat(lab[diff], nbin), labels[:-1]))
11951195
labels.append(left[-1])
11961196

1197-
mi = MultiIndex(levels=levels, labels=labels, names=names,
1197+
mi = MultiIndex(levels=levels, codes=labels, names=names,
11981198
verify_integrity=False)
11991199

12001200
if is_integer_dtype(out):

pandas/core/groupby/ops.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,10 @@ def result_index(self):
290290
if not self.compressed and len(self.groupings) == 1:
291291
return self.groupings[0].result_index.rename(self.names[0])
292292

293-
labels = self.recons_labels
293+
codes = self.recons_labels
294294
levels = [ping.result_index for ping in self.groupings]
295295
result = MultiIndex(levels=levels,
296-
labels=labels,
296+
codes=codes,
297297
verify_integrity=False,
298298
names=self.names)
299299
return result

0 commit comments

Comments
 (0)