Skip to content

Commit 8e74e5f

Browse files
Reformatting fixes (black)
1 parent 267e451 commit 8e74e5f

File tree

2 files changed

+25
-6
lines changed

2 files changed

+25
-6
lines changed

pandas/io/excel/_base.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,10 @@ def _is_ods_stream(stream):
783783
is_ods = False
784784
if stream.read(4) == b"PK\003\004":
785785
stream.seek(30)
786-
is_ods = stream.read(54) == b"mimetype" \
786+
is_ods = (
787+
stream.read(54) == b"mimetype"
787788
b"application/vnd.oasis.opendocument.spreadsheet"
789+
)
788790
stream.seek(0)
789791
return is_ods
790792

pandas/tests/io/excel/test_writers.py

+22-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ def set_engine(engine, ext):
5454
pytest.param(".xlsx", marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")]),
5555
pytest.param(".xlsm", marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")]),
5656
pytest.param(".xls", marks=[td.skip_if_no("xlwt"), td.skip_if_no("xlrd")]),
57-
pytest.param(".xlsx", marks=[td.skip_if_no("xlsxwriter"), td.skip_if_no("xlrd")]),
57+
pytest.param(
58+
".xlsx", marks=[td.skip_if_no("xlsxwriter"), td.skip_if_no("xlrd")]
59+
),
5860
pytest.param(".ods", marks=td.skip_if_no("odf")),
5961
],
6062
)
@@ -295,10 +297,24 @@ def test_multiindex_interval_datetimes(self, ext):
295297
@pytest.mark.parametrize(
296298
"engine,ext",
297299
[
298-
pytest.param("openpyxl", ".xlsx", marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")]),
299-
pytest.param("openpyxl", ".xlsm", marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")]),
300-
pytest.param("xlwt", ".xls", marks=[td.skip_if_no("xlwt"), td.skip_if_no("xlrd")]),
301-
pytest.param("xlsxwriter", ".xlsx", marks=[td.skip_if_no("xlsxwriter"), td.skip_if_no("xlrd")]),
300+
pytest.param(
301+
"openpyxl",
302+
".xlsx",
303+
marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")],
304+
),
305+
pytest.param(
306+
"openpyxl",
307+
".xlsm",
308+
marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")],
309+
),
310+
pytest.param(
311+
"xlwt", ".xls", marks=[td.skip_if_no("xlwt"), td.skip_if_no("xlrd")]
312+
),
313+
pytest.param(
314+
"xlsxwriter",
315+
".xlsx",
316+
marks=[td.skip_if_no("xlsxwriter"), td.skip_if_no("xlrd")],
317+
),
302318
pytest.param("odf", ".ods", marks=td.skip_if_no("odf")),
303319
],
304320
)
@@ -337,6 +353,7 @@ def test_excel_sheet_by_name_raise(self, path, engine):
337353
pd.read_excel(xl, "0")
338354
else:
339355
import xlrd
356+
340357
msg = "No sheet named <'0'>"
341358
with pytest.raises(xlrd.XLRDError, match=msg):
342359
pd.read_excel(xl, sheet_name="0")

0 commit comments

Comments
 (0)