Skip to content

Commit a23e91f

Browse files
pre-commit-ci[bot]salva
authored andcommitted
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 6ad5db5 commit a23e91f

File tree

2 files changed

+38
-40
lines changed

2 files changed

+38
-40
lines changed

pandas/io/excel/_base.py

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,6 @@ def _parse_sheet(
817817
dtype_backend: DtypeBackend | lib.NoDefault = lib.no_default,
818818
**kwds,
819819
):
820-
821820
if callable(skiprows):
822821
# In order to avoid calling skiprows multiple times on
823822
# every row, we just do it here and keep the resulting
@@ -839,9 +838,7 @@ def _parse_sheet(
839838
skiprows_set = set(cast(Sequence[int], skiprows))
840839
ixmap = [ix for ix in range(len(data)) if ix not in skiprows_set]
841840
else:
842-
raise ValueError(
843-
"skiprows must be an integer or a list of integers"
844-
)
841+
raise ValueError("skiprows must be an integer or a list of integers")
845842
nixs = len(ixmap)
846843

847844
index_col_has_names = False
@@ -870,9 +867,7 @@ def _parse_sheet(
870867
elif is_list_like(header):
871868
header_list = header
872869
else:
873-
raise ValueError(
874-
"header must be an integer or a list of integers"
875-
)
870+
raise ValueError("header must be an integer or a list of integers")
876871

877872
header_names = []
878873

@@ -899,12 +894,14 @@ def _parse_sheet(
899894
control_row = [True] * len(data[0])
900895
for row in header_list:
901896
row1 = ixmap[row]
902-
data[row1], control_row = fill_mi_header(data[row1],
903-
control_row)
897+
data[row1], control_row = fill_mi_header(
898+
data[row1], control_row
899+
)
904900

905901
if has_index:
906-
header_name, _ = pop_header_name(data[row1],
907-
sorted(index_col_set))
902+
header_name, _ = pop_header_name(
903+
data[row1], sorted(index_col_set)
904+
)
908905
if header_name:
909906
header_names.append(header_name)
910907

@@ -930,7 +927,7 @@ def _parse_sheet(
930927
if has_index and offset < nixs:
931928
for col in index_col_set:
932929
last = data[ixmap[offset]][col]
933-
for row1 in ixmap[offset+1:]:
930+
for row1 in ixmap[offset + 1 :]:
934931
if data[row1][col] == "" or data[row1][col] is None:
935932
data[row1][col] = last
936933
else:
@@ -963,8 +960,9 @@ def _parse_sheet(
963960
output[asheetname] = parser.read(nrows=nrows)
964961

965962
if header_names:
966-
output[asheetname].columns = \
967-
output[asheetname].columns.set_names(header_names)
963+
output[asheetname].columns = output[asheetname].columns.set_names(
964+
header_names
965+
)
968966

969967
except EmptyDataError:
970968
# No Data, return an empty DataFrame

pandas/tests/io/excel/test_readers.py

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,49 +1763,49 @@ def test_corrupt_files_closed(self, engine, tmp_excel):
17631763
def test_mi_header_skiprows1(self, engine, read_ext):
17641764
if engine is None and read_ext == ".xlsx":
17651765
with open("test_mi_holes.xlsx", "rb") as f:
1766-
expected = pd.read_excel(f,
1767-
sheet_name='expected',
1768-
header=[0, 1],
1769-
index_col=[0, 1])
1766+
expected = pd.read_excel(
1767+
f, sheet_name="expected", header=[0, 1], index_col=[0, 1]
1768+
)
17701769

17711770
with open("test_mi_holes.xlsx", "rb") as f:
1772-
actual = pd.read_excel(f,
1773-
sheet_name='skiprows1',
1774-
skiprows=1,
1775-
header=[0, 1],
1776-
index_col=[0, 1])
1771+
actual = pd.read_excel(
1772+
f,
1773+
sheet_name="skiprows1",
1774+
skiprows=1,
1775+
header=[0, 1],
1776+
index_col=[0, 1],
1777+
)
17771778

17781779
tm.assert_frame_equal(expected, actual)
17791780

17801781
def test_mi_header_hole(self, engine, read_ext):
17811782
if engine is None and read_ext == ".xlsx":
17821783
with open("test_mi_holes.xlsx", "rb") as f:
1783-
expected = pd.read_excel(f,
1784-
sheet_name='expected',
1785-
header=[0, 1],
1786-
index_col=[0, 1])
1784+
expected = pd.read_excel(
1785+
f, sheet_name="expected", header=[0, 1], index_col=[0, 1]
1786+
)
17871787

17881788
with open("test_mi_holes.xlsx", "rb") as f:
1789-
actual = pd.read_excel(f,
1790-
sheet_name='header_hole',
1791-
skiprows=[1],
1792-
header=[0, 1],
1793-
index_col=[0, 1])
1789+
actual = pd.read_excel(
1790+
f,
1791+
sheet_name="header_hole",
1792+
skiprows=[1],
1793+
header=[0, 1],
1794+
index_col=[0, 1],
1795+
)
17941796

17951797
tm.assert_frame_equal(expected, actual)
17961798

17971799
def test_mi_header_and_index_holes(self, engine, read_ext):
17981800
if engine is None and read_ext == ".xlsx":
17991801
with open("test_mi_holes.xlsx", "rb") as f:
1800-
expected = pd.read_excel(f,
1801-
sheet_name='expected_index_hole',
1802-
header=[0, 1],
1803-
index_col=[0, 1])
1802+
expected = pd.read_excel(
1803+
f, sheet_name="expected_index_hole", header=[0, 1], index_col=[0, 1]
1804+
)
18041805

18051806
with open("test_mi_holes.xlsx", "rb") as f:
1806-
actual = pd.read_excel(f,
1807-
sheet_name='index_hole',
1808-
header=[0, 2],
1809-
index_col=[0, 1])
1807+
actual = pd.read_excel(
1808+
f, sheet_name="index_hole", header=[0, 2], index_col=[0, 1]
1809+
)
18101810

18111811
tm.assert_frame_equal(expected, actual)

0 commit comments

Comments
 (0)