Skip to content

Commit dd6feb7

Browse files
committed
pep8 fixes
2 parents 0fcfcc2 + 2c45501 commit dd6feb7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

pandas/tools/pivot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def pivot_table(data, values=None, index=None, columns=None, aggfunc='mean',
164164

165165
# discard the top level
166166
if values_passed and not values_multi and not table.empty and \
167-
(table.columns.nlevels > 1):
167+
(table.columns.nlevels > 1):
168168
table = table[values[0]]
169169

170170
if len(index) == 0 and len(columns) > 0:

pandas/tools/tests/test_pivot.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,12 @@ def _check_output(result, values_col, index=['A', 'B'],
350350
# no rows
351351
rtable = self.data.pivot_table(columns=['AA', 'BB'], margins=True,
352352
aggfunc=np.mean)
353-
expected = self.data.groupby(['AA','BB']).mean()
353+
expected = self.data.groupby(['AA', 'BB']).mean()
354354
expected.loc[('All', ''), :] = self.data[['DD', 'EE', 'FF']].mean()
355355
expected = (expected.stack()
356356
.unstack(['BB', 'AA'])
357357
.stack(['AA', 'BB'])
358-
.to_frame())#this still returns a series
358+
.to_frame())
359359

360360
tm.assert_frame_equal(expected, rtable)
361361

@@ -490,7 +490,7 @@ def test_margins_no_values_no_cols(self):
490490
expected.loc[('All', '')] = expected.sum()
491491
expected = expected.to_frame()
492492

493-
tm.assert_frame_equal(result, expected) #need to return dataframe
493+
tm.assert_frame_equal(result, expected)
494494

495495
def test_margins_no_values_two_rows(self):
496496
# Regression test on pivot table: no values passed but rows are a

0 commit comments

Comments
 (0)