Skip to content

Commit cc1f6f8

Browse files
committed
make requested changes
1 parent a03d5b5 commit cc1f6f8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pandas/io/parsers.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1400,14 +1400,14 @@ def __init__(self, kwds):
14001400
"when specifying a multi-index header"
14011401
)
14021402
elif self.header is not None:
1403-
# GH 16338
1404-
if not is_integer(self.header):
1405-
raise ValueError("header must be integer or list of integers")
14061403
# GH 27394
1407-
elif self.prefix is not None:
1404+
if self.prefix is not None:
14081405
raise ValueError(
14091406
"Argument prefix must be None if argument header is not None"
14101407
)
1408+
# GH 16338
1409+
elif not is_integer(self.header):
1410+
raise ValueError("header must be integer or list of integers")
14111411
# GH 27779
14121412
elif self.header < 0:
14131413
raise ValueError(

pandas/tests/io/parser/test_common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,7 @@ def test_read_csv_memory_growth_chunksize(all_parsers):
20432043
def test_read_csv_raises_on_header_prefix(all_parsers):
20442044
# gh-27394
20452045
parser = all_parsers
2046-
msg = ("Argument prefix must be None if argument header is not None")
2046+
msg = "Argument prefix must be None if argument header is not None"
20472047
s = StringIO("0,1\n2,3")
20482048
with pytest.raises(ValueError, match=msg):
20492049
parser.read_csv(s, header=0, prefix="_X")

0 commit comments

Comments
 (0)