Skip to content

Commit 84a62b8

Browse files
committed
fixup some tests after rebase
1 parent 0d540e4 commit 84a62b8

File tree

1 file changed

+11
-36
lines changed

1 file changed

+11
-36
lines changed

pandas/tests/io/parser/test_parse_dates.py

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -917,10 +917,7 @@ def test_multi_index_parse_dates(all_parsers, index_col):
917917
columns=["A", "B", "C"],
918918
index=index,
919919
)
920-
with tm.assert_produces_warning(
921-
UserWarning, match="Parsing datetime strings without a format specified"
922-
):
923-
result = parser.read_csv(StringIO(data), index_col=index_col, parse_dates=True)
920+
result = parser.read_csv(StringIO(data), index_col=index_col, parse_dates=True)
924921
tm.assert_frame_equal(result, expected)
925922

926923

@@ -1168,15 +1165,16 @@ def test_multiple_date_cols_chunked(all_parsers):
11681165
columns=["nominal", "ID", "actualTime", "A", "B", "C", "D", "E"],
11691166
)
11701167
expected = expected.set_index("nominal")
1171-
with parser.read_csv_check_warnings(
1172-
UserWarning,
1173-
"Parsing datetime strings without a format specified",
1168+
with parser.read_csv(
11741169
StringIO(data),
11751170
parse_dates={"nominal": [1, 2]},
11761171
index_col="nominal",
11771172
chunksize=2,
11781173
) as reader:
1179-
chunks = list(reader)
1174+
with tm.assert_produces_warning(
1175+
UserWarning, match="without a format specified"
1176+
):
1177+
chunks = list(reader)
11801178

11811179
tm.assert_frame_equal(chunks[0], expected[:2])
11821180
tm.assert_frame_equal(chunks[1], expected[2:4])
@@ -1592,9 +1590,7 @@ def date_parser(dt, time):
15921590
arr = [datetime.combine(d, t) for d, t in zip(dt, time)]
15931591
return np.array(arr, dtype="datetime64[s]")
15941592

1595-
result = parser.read_csv_with_warnings(
1596-
UserWarning,
1597-
"without a format specified",
1593+
result = parser.read_csv(
15981594
StringIO(data),
15991595
date_parser=date_parser,
16001596
parse_dates={"datetime": ["date", "time"]},
@@ -1678,34 +1674,13 @@ def test_parse_timezone(all_parsers):
16781674

16791675
@skip_pyarrow
16801676
@pytest.mark.parametrize(
1681-
"date_string, warning, msg",
1682-
[
1683-
("32/32/2019", None, ""),
1684-
("02/30/2019", None, ""),
1685-
("13/13/2019", None, ""),
1686-
("13/2019", None, ""),
1687-
(
1688-
"a3/11/2018",
1689-
UserWarning,
1690-
"Parsing datetime strings without a format specified",
1691-
),
1692-
(
1693-
"10/11/2o17",
1694-
UserWarning,
1695-
"Parsing datetime strings without a format specified",
1696-
),
1697-
],
1677+
"date_string",
1678+
["32/32/2019", "02/30/2019", "13/13/2019", "13/2019", "a3/11/2018", "10/11/2o17"],
16981679
)
1699-
def test_invalid_parse_delimited_date(all_parsers, date_string, warning, msg):
1680+
def test_invalid_parse_delimited_date(all_parsers, date_string):
17001681
parser = all_parsers
17011682
expected = DataFrame({0: [date_string]}, dtype="object")
1702-
result = parser.read_csv_check_warnings(
1703-
warning,
1704-
msg,
1705-
StringIO(date_string),
1706-
header=None,
1707-
parse_dates=[0],
1708-
)
1683+
result = parser.read_csv(StringIO(date_string), header=None, parse_dates=[0])
17091684
tm.assert_frame_equal(result, expected)
17101685

17111686

0 commit comments

Comments
 (0)