Skip to content

Commit 9a1e153

Browse files
Reformatting fixes (black)
1 parent 35a6524 commit 9a1e153

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
)
@@ -288,10 +290,24 @@ def test_multiindex_interval_datetimes(self, ext):
288290
@pytest.mark.parametrize(
289291
"engine,ext",
290292
[
291-
pytest.param("openpyxl", ".xlsx", marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")]),
292-
pytest.param("openpyxl", ".xlsm", marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")]),
293-
pytest.param("xlwt", ".xls", marks=[td.skip_if_no("xlwt"), td.skip_if_no("xlrd")]),
294-
pytest.param("xlsxwriter", ".xlsx", marks=[td.skip_if_no("xlsxwriter"), td.skip_if_no("xlrd")]),
293+
pytest.param(
294+
"openpyxl",
295+
".xlsx",
296+
marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")],
297+
),
298+
pytest.param(
299+
"openpyxl",
300+
".xlsm",
301+
marks=[td.skip_if_no("openpyxl"), td.skip_if_no("xlrd")],
302+
),
303+
pytest.param(
304+
"xlwt", ".xls", marks=[td.skip_if_no("xlwt"), td.skip_if_no("xlrd")]
305+
),
306+
pytest.param(
307+
"xlsxwriter",
308+
".xlsx",
309+
marks=[td.skip_if_no("xlsxwriter"), td.skip_if_no("xlrd")],
310+
),
295311
pytest.param("odf", ".ods", marks=td.skip_if_no("odf")),
296312
],
297313
)
@@ -330,6 +346,7 @@ def test_excel_sheet_by_name_raise(self, path, engine):
330346
pd.read_excel(xl, "0")
331347
else:
332348
import xlrd
349+
333350
msg = "No sheet named <'0'>"
334351
with pytest.raises(xlrd.XLRDError, match=msg):
335352
pd.read_excel(xl, "0")

0 commit comments

Comments
 (0)