Skip to content

Commit ad4a761

Browse files
committed
fix if/else
1 parent 0a6e4be commit ad4a761

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

pandas/core/reshape/pivot.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -368,16 +368,13 @@ def _convert_by(by):
368368
@Appender(_shared_docs['pivot'], indents=1)
369369
def pivot(data, index=None, columns=None, values=None):
370370
if values is None:
371-
if index is None:
372-
# Build cols for indexes.
373-
cols = [columns]
371+
cols = []
372+
# Make acceptable for multiple column indexes.
373+
if is_list_like(index):
374+
cols.extend(index)
374375
else:
375-
# Accept multiple column indexes.
376-
if is_list_like(index):
377-
cols = index
378-
else:
379-
cols = [index]
380-
cols.append(columns)
376+
cols.append(index)
377+
cols.append(columns)
381378
append = index is None
382379
indexed = data.set_index(cols, append=append)
383380

pandas/tests/reshape/test_pivot.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,11 @@ def test_pivot_multiple_columns_as_index(self, method):
321321
result = df.pivot(index=['lev1', 'lev2'],
322322
columns='lev3')
323323
exp_columns = MultiIndex(levels=[['values'], [1, 2]],
324-
codes=[[0, 0], [0, 1]],
325-
names=[None, 'lev3'])
324+
codes=[[0, 0], [0, 1]],
325+
names=[None, 'lev3'])
326326

327327
expected = DataFrame(data=data, index=exp_index,
328-
columns=exp_columns)
328+
columns=exp_columns)
329329
tm.assert_frame_equal(result, expected)
330330

331331
@pytest.mark.parametrize('method', [True, False])

0 commit comments

Comments
 (0)