Skip to content

Commit 1ee6491

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 1615371 commit 1ee6491

File tree

2 files changed

+38
-40
lines changed

2 files changed

+38
-40
lines changed

pandas/io/excel/_base.py

+12-14
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,6 @@ def _parse_sheet(
818818
**kwds,
819819
):
820820
try:
821-
822821
# header indexes reference rows after removing skiprows, so we
823822
# create an index map from the without-skiprows to the
824823
# original indexes.
@@ -832,9 +831,7 @@ def _parse_sheet(
832831
elif callable(skiprows):
833832
ixmap = [ix for ix, _ in enumerate(data) if not skiprows(ix)]
834833
else:
835-
raise ValueError(
836-
"skiprows must be an integer or a list of integers"
837-
)
834+
raise ValueError("skiprows must be an integer or a list of integers")
838835
nixs = len(ixmap)
839836

840837
index_col_has_names = False
@@ -863,9 +860,7 @@ def _parse_sheet(
863860
elif is_list_like(header):
864861
header_list = header
865862
else:
866-
raise ValueError(
867-
"header must be an integer or a list of integers"
868-
)
863+
raise ValueError("header must be an integer or a list of integers")
869864

870865
header_names = []
871866

@@ -892,12 +887,14 @@ def _parse_sheet(
892887
control_row = [True] * len(data[0])
893888
for row in header_list:
894889
row1 = ixmap[row]
895-
data[row1], control_row = fill_mi_header(data[row1],
896-
control_row)
890+
data[row1], control_row = fill_mi_header(
891+
data[row1], control_row
892+
)
897893

898894
if has_index:
899-
header_name, _ = pop_header_name(data[row1],
900-
sorted(index_col_set))
895+
header_name, _ = pop_header_name(
896+
data[row1], sorted(index_col_set)
897+
)
901898
if header_name:
902899
header_names.append(header_name)
903900

@@ -923,7 +920,7 @@ def _parse_sheet(
923920
if has_index and offset < nixs:
924921
for col in index_col_set:
925922
last = data[ixmap[offset]][col]
926-
for row1 in ixmap[offset+1:]:
923+
for row1 in ixmap[offset + 1 :]:
927924
if data[row1][col] == "" or data[row1][col] is None:
928925
data[row1][col] = last
929926
else:
@@ -956,8 +953,9 @@ def _parse_sheet(
956953
output[asheetname] = parser.read(nrows=nrows)
957954

958955
if header_names:
959-
output[asheetname].columns = \
960-
output[asheetname].columns.set_names(header_names)
956+
output[asheetname].columns = output[asheetname].columns.set_names(
957+
header_names
958+
)
961959

962960
except EmptyDataError:
963961
# No Data, return an empty DataFrame

pandas/tests/io/excel/test_readers.py

+26-26
Original file line numberDiff line numberDiff line change
@@ -1733,49 +1733,49 @@ def test_corrupt_files_closed(self, engine, tmp_excel):
17331733
def test_mi_header_skiprows1(self, engine, read_ext):
17341734
if engine is None and read_ext == ".xlsx":
17351735
with open("test_mi_holes.xlsx", "rb") as f:
1736-
expected = pd.read_excel(f,
1737-
sheet_name='expected',
1738-
header=[0, 1],
1739-
index_col=[0, 1])
1736+
expected = pd.read_excel(
1737+
f, sheet_name="expected", header=[0, 1], index_col=[0, 1]
1738+
)
17401739

17411740
with open("test_mi_holes.xlsx", "rb") as f:
1742-
actual = pd.read_excel(f,
1743-
sheet_name='skiprows1',
1744-
skiprows=1,
1745-
header=[0, 1],
1746-
index_col=[0, 1])
1741+
actual = pd.read_excel(
1742+
f,
1743+
sheet_name="skiprows1",
1744+
skiprows=1,
1745+
header=[0, 1],
1746+
index_col=[0, 1],
1747+
)
17471748

17481749
tm.assert_frame_equal(expected, actual)
17491750

17501751
def test_mi_header_hole(self, engine, read_ext):
17511752
if engine is None and read_ext == ".xlsx":
17521753
with open("test_mi_holes.xlsx", "rb") as f:
1753-
expected = pd.read_excel(f,
1754-
sheet_name='expected',
1755-
header=[0, 1],
1756-
index_col=[0, 1])
1754+
expected = pd.read_excel(
1755+
f, sheet_name="expected", header=[0, 1], index_col=[0, 1]
1756+
)
17571757

17581758
with open("test_mi_holes.xlsx", "rb") as f:
1759-
actual = pd.read_excel(f,
1760-
sheet_name='header_hole',
1761-
skiprows=[1],
1762-
header=[0, 1],
1763-
index_col=[0, 1])
1759+
actual = pd.read_excel(
1760+
f,
1761+
sheet_name="header_hole",
1762+
skiprows=[1],
1763+
header=[0, 1],
1764+
index_col=[0, 1],
1765+
)
17641766

17651767
tm.assert_frame_equal(expected, actual)
17661768

17671769
def test_mi_header_and_index_holes(self, engine, read_ext):
17681770
if engine is None and read_ext == ".xlsx":
17691771
with open("test_mi_holes.xlsx", "rb") as f:
1770-
expected = pd.read_excel(f,
1771-
sheet_name='expected_index_hole',
1772-
header=[0, 1],
1773-
index_col=[0, 1])
1772+
expected = pd.read_excel(
1773+
f, sheet_name="expected_index_hole", header=[0, 1], index_col=[0, 1]
1774+
)
17741775

17751776
with open("test_mi_holes.xlsx", "rb") as f:
1776-
actual = pd.read_excel(f,
1777-
sheet_name='index_hole',
1778-
header=[0, 2],
1779-
index_col=[0, 1])
1777+
actual = pd.read_excel(
1778+
f, sheet_name="index_hole", header=[0, 2], index_col=[0, 1]
1779+
)
17801780

17811781
tm.assert_frame_equal(expected, actual)

0 commit comments

Comments
 (0)