Skip to content

Commit

Permalink
LINTing
Browse files Browse the repository at this point in the history
  • Loading branch information
WillAyd committed Feb 21, 2018
1 parent 0587a1c commit fb918f1
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions pandas/tests/io/test_excel.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,17 +165,17 @@ def test_usecols_str(self, ext):
df1 = dfref.reindex(columns=['B', 'C'])
df2 = self.get_exceldf('test1', ext, 'Sheet1', index_col=0,
usecols='A,C,D')
df3 = self.get_exceldf('test1', ext, 'Sheet2', skiprows=[1], index_col=0,
usecols='A,C,D')
df3 = self.get_exceldf('test1', ext, 'Sheet2', skiprows=[1],
index_col=0, usecols='A,C,D')
# TODO add index to xls file
tm.assert_frame_equal(df2, df1, check_names=False)
tm.assert_frame_equal(df3, df1, check_names=False)

df1 = dfref.reindex(columns=['B', 'C'])
df2 = self.get_exceldf('test1', ext, 'Sheet1', index_col=0,
usecols='A,C:D')
df3 = self.get_exceldf('test1', ext, 'Sheet2', skiprows=[1], index_col=0,
usecols='A,C:D')
df3 = self.get_exceldf('test1', ext, 'Sheet2', skiprows=[1],
index_col=0, usecols='A,C:D')
tm.assert_frame_equal(df2, df1, check_names=False)
tm.assert_frame_equal(df3, df1, check_names=False)

Expand Down Expand Up @@ -1473,7 +1473,8 @@ def test_to_excel_multiindex_dates(self, merge_cells, engine, ext):
tm.assert_frame_equal(tsframe, recons)
assert recons.index.names == ('time', 'foo')

def test_to_excel_multiindex_no_write_index(self, merge_cells, engine, ext):
def test_to_excel_multiindex_no_write_index(self, merge_cells, engine,
ext):
# Test writing and re-reading a MI witout the index. GH 5616.

# Initial non-MI frame.
Expand Down Expand Up @@ -1697,7 +1698,7 @@ def roundtrip(df, header=True, parser_hdr=0, index=True):
assert res.iloc[0, 0] is not np.nan

def test_excel_010_hemstring_raises_NotImplementedError(self, merge_cells,
engine,ext):
engine, ext):
# This test was failing only for j>1 and header=False,
# So I reproduced a simple test.
if merge_cells:
Expand Down

0 comments on commit fb918f1

Please sign in to comment.