Skip to content

Commit f72d3d6

Browse files
author
MarcoGorelli
committed
fixup
1 parent 5d0ee97 commit f72d3d6

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

pandas/tests/tools/test_to_datetime.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -1826,10 +1826,7 @@ def test_dataframe_mixed(self, cache):
18261826
def test_dataframe_float(self, cache):
18271827
# float
18281828
df = DataFrame({"year": [2000, 2001], "month": [1.5, 1], "day": [1, 1]})
1829-
msg = (
1830-
'cannot assemble the datetimes: time data "20000151" at position 0 '
1831-
'doesn\'t match format "%Y%m%d"'
1832-
)
1829+
msg = "cannot assemble the datetimes: unconverted data remains: 1"
18331830
with pytest.raises(ValueError, match=msg):
18341831
to_datetime(df, cache=cache)
18351832

@@ -3009,7 +3006,6 @@ def test_na_to_datetime(nulls_fixture, klass):
30093006

30103007

30113008
@pytest.mark.parametrize("errors", ["raise", "coerce", "ignore"])
3012-
<<<<<<< HEAD
30133009
@pytest.mark.parametrize(
30143010
"args, format",
30153011
[
@@ -3021,12 +3017,6 @@ def test_na_to_datetime(nulls_fixture, klass):
30213017
def test_empty_string_datetime(errors, args, format):
30223018
# GH13044, GH50251
30233019
td = Series(args)
3024-
=======
3025-
def test_empty_string_datetime_coerce_format(errors):
3026-
# GH13044, GH50251
3027-
td = Series(["03/24/2016", "03/25/2016", ""])
3028-
format = "%m/%d/%Y"
3029-
>>>>>>> 8fad3173b2aca474c43af653dba9da86cbc421d4
30303020

30313021
# coerce empty string to pd.NaT
30323022
result = to_datetime(td, format=format, errors=errors)

0 commit comments

Comments
 (0)