Skip to content

Commit

Permalink
Revert "TST: remove deprecated usages of FrozenList.__add__ from test…
Browse files Browse the repository at this point in the history
… code"

This reverts commit cd67704.
  • Loading branch information
jorisvandenbossche committed Mar 4, 2017
1 parent 0b07b07 commit 527ded9
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions pandas/core/panel.py
Expand Up @@ -940,9 +940,9 @@ def construct_index_parts(idx, major=True):
minor_labels, minor_levels, minor_names = construct_index_parts(
self.minor_axis, major=False)

levels = list(major_levels) + list(minor_levels)
labels = list(major_labels) + list(minor_labels)
names = list(major_names) + list(minor_names)
levels = major_levels + minor_levels
labels = major_labels + minor_labels
names = major_names + minor_names

index = MultiIndex(levels=levels, labels=labels, names=names,
verify_integrity=False)
Expand Down
6 changes: 3 additions & 3 deletions pandas/core/reshape.py
Expand Up @@ -216,8 +216,8 @@ def get_new_columns(self):
width = len(self.value_columns)
propagator = np.repeat(np.arange(width), stride)
if isinstance(self.value_columns, MultiIndex):
new_levels = self.value_columns.levels.union((self.removed_level,))
new_names = self.value_columns.names.union((self.removed_name,))
new_levels = self.value_columns.levels + (self.removed_level,)
new_names = self.value_columns.names + (self.removed_name,)

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

mcolumns = list(id_vars) + list(var_name) + list([value_name])
mcolumns = id_vars + var_name + [value_name]

mdata[value_name] = frame.values.ravel('F')
for i, col in enumerate(var_name):
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/strings.py
Expand Up @@ -787,7 +787,7 @@ def str_extractall(arr, pat, flags=0):
if 0 < len(index_list):
from pandas import MultiIndex
index = MultiIndex.from_tuples(
index_list, names=arr.index.names.union(["match"]))
index_list, names=arr.index.names + ["match"])
else:
index = None
result = arr._constructor_expanddim(match_list, index=index,
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/groupby/test_value_counts.py
Expand Up @@ -28,7 +28,7 @@ def check_value_counts(df, keys, bins):

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

# have to sort on index because of unstable sort on values
left, right = map(rebuild_index, (left, right)) # xref GH9212
Expand Down
2 changes: 1 addition & 1 deletion pandas/tools/concat.py
Expand Up @@ -574,7 +574,7 @@ def _make_concat_multiindex(indexes, keys, levels=None, names=None):
" not have the same number of levels")

# also copies
names = list(names) + list(_get_consensus_names(indexes))
names = names + _get_consensus_names(indexes)

return MultiIndex(levels=levels, labels=label_list, names=names,
verify_integrity=False)
Expand Down
2 changes: 1 addition & 1 deletion test_fast.sh
Expand Up @@ -5,4 +5,4 @@
# https://github.com/pytest-dev/pytest/issues/1075
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')

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

0 comments on commit 527ded9

Please sign in to comment.