@@ -1826,10 +1826,7 @@ def test_dataframe_mixed(self, cache):
1826
1826
def test_dataframe_float (self , cache ):
1827
1827
# float
1828
1828
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"
1833
1830
with pytest .raises (ValueError , match = msg ):
1834
1831
to_datetime (df , cache = cache )
1835
1832
@@ -3009,7 +3006,6 @@ def test_na_to_datetime(nulls_fixture, klass):
3009
3006
3010
3007
3011
3008
@pytest .mark .parametrize ("errors" , ["raise" , "coerce" , "ignore" ])
3012
- < << << << HEAD
3013
3009
@pytest .mark .parametrize (
3014
3010
"args, format" ,
3015
3011
[
@@ -3021,12 +3017,6 @@ def test_na_to_datetime(nulls_fixture, klass):
3021
3017
def test_empty_string_datetime (errors , args , format ):
3022
3018
# GH13044, GH50251
3023
3019
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
- > >> >> >> 8 fad3173b2aca474c43af653dba9da86cbc421d4
3030
3020
3031
3021
# coerce empty string to pd.NaT
3032
3022
result = to_datetime (td , format = format , errors = errors )
0 commit comments