Skip to content

Commit 527ded9

Browse files
Revert "TST: remove deprecated usages of FrozenList.__add__ from test code"
This reverts commit cd67704.
1 parent 0b07b07 commit 527ded9

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

pandas/core/panel.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -940,9 +940,9 @@ def construct_index_parts(idx, major=True):
940940
minor_labels, minor_levels, minor_names = construct_index_parts(
941941
self.minor_axis, major=False)
942942

943-
levels = list(major_levels) + list(minor_levels)
944-
labels = list(major_labels) + list(minor_labels)
945-
names = list(major_names) + list(minor_names)
943+
levels = major_levels + minor_levels
944+
labels = major_labels + minor_labels
945+
names = major_names + minor_names
946946

947947
index = MultiIndex(levels=levels, labels=labels, names=names,
948948
verify_integrity=False)

pandas/core/reshape.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ def get_new_columns(self):
216216
width = len(self.value_columns)
217217
propagator = np.repeat(np.arange(width), stride)
218218
if isinstance(self.value_columns, MultiIndex):
219-
new_levels = self.value_columns.levels.union((self.removed_level,))
220-
new_names = self.value_columns.names.union((self.removed_name,))
219+
new_levels = self.value_columns.levels + (self.removed_level,)
220+
new_names = self.value_columns.names + (self.removed_name,)
221221

222222
new_labels = [lab.take(propagator)
223223
for lab in self.value_columns.labels]
@@ -806,7 +806,7 @@ def melt(frame, id_vars=None, value_vars=None, var_name=None,
806806
for col in id_vars:
807807
mdata[col] = np.tile(frame.pop(col).values, K)
808808

809-
mcolumns = list(id_vars) + list(var_name) + list([value_name])
809+
mcolumns = id_vars + var_name + [value_name]
810810

811811
mdata[value_name] = frame.values.ravel('F')
812812
for i, col in enumerate(var_name):

pandas/core/strings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ def str_extractall(arr, pat, flags=0):
787787
if 0 < len(index_list):
788788
from pandas import MultiIndex
789789
index = MultiIndex.from_tuples(
790-
index_list, names=arr.index.names.union(["match"]))
790+
index_list, names=arr.index.names + ["match"])
791791
else:
792792
index = None
793793
result = arr._constructor_expanddim(match_list, index=index,

pandas/tests/groupby/test_value_counts.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def check_value_counts(df, keys, bins):
2828

2929
gr = df.groupby(keys, sort=isort)
3030
right = gr['3rd'].apply(Series.value_counts, **kwargs)
31-
right.index.names = right.index.names[:-1].union(['3rd'])
31+
right.index.names = right.index.names[:-1] + ['3rd']
3232

3333
# have to sort on index because of unstable sort on values
3434
left, right = map(rebuild_index, (left, right)) # xref GH9212

pandas/tools/concat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ def _make_concat_multiindex(indexes, keys, levels=None, names=None):
574574
" not have the same number of levels")
575575

576576
# also copies
577-
names = list(names) + list(_get_consensus_names(indexes))
577+
names = names + _get_consensus_names(indexes)
578578

579579
return MultiIndex(levels=levels, labels=label_list, names=names,
580580
verify_integrity=False)

test_fast.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# https://github.com/pytest-dev/pytest/issues/1075
66
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
77

8-
pytest pandas --skip-slow --skip-network -m "not single" -n 4 $@
8+
pytest pandas --skip-slow --skip-network -m "not single" -n 4

0 commit comments

Comments
 (0)