fixup tests

Author: MarcoGorelli

pandas/_libs/tslibs/strptime.pyx

@@ -137,6 +137,7 @@ def array_strptime(
     exact : matches must be exact if True, search if False
     errors : string specifying error handling, {'raise', 'ignore', 'coerce'}
     """
+
     cdef:
         Py_ssize_t i, n = len(values)
         npy_datetimestruct dts
@@ -277,57 +278,45 @@ def array_strptime(
             else:
                 val = str(val)
 
-        if iso_format:
-            string_to_dts_failed = string_to_dts(
-                val, &dts, &out_bestunit, &out_local,
-                &out_tzoffset, False, fmt, exact
-            )
-            if not string_to_dts_failed:
-                # No error reported by string_to_dts, pick back up
-                # where we left off
-                value = npy_datetimestruct_to_datetime(NPY_FR_ns, &dts)
-                if out_local == 1:
-                    # Store the out_tzoffset in seconds
-                    # since we store the total_seconds of
-                    # dateutil.tz.tzoffset objects
-                    tz = timezone(timedelta(minutes=out_tzoffset))
-                    result_timezone[i] = tz
-                    out_local = 0
-                    out_tzoffset = 0
-                iresult[i] = value
-                try:
+            if iso_format:
+                string_to_dts_failed = string_to_dts(
+                    val, &dts, &out_bestunit, &out_local,
+                    &out_tzoffset, False, fmt, exact
+                )
+                if not string_to_dts_failed:
+                    # No error reported by string_to_dts, pick back up
+                    # where we left off
+                    value = npy_datetimestruct_to_datetime(NPY_FR_ns, &dts)
+                    if out_local == 1:
+                        # Store the out_tzoffset in seconds
+                        # since we store the total_seconds of
+                        # dateutil.tz.tzoffset objects
+                        tz = timezone(timedelta(minutes=out_tzoffset))
+                        result_timezone[i] = tz
+                        out_local = 0
+                        out_tzoffset = 0
+                    iresult[i] = value
                     check_dts_bounds(&dts)
-                except ValueError:
-                    if is_coerce:
-                        iresult[i] = NPY_NAT
-                        continue
-                    raise
-                continue
+                    continue
 
-        if parse_today_now(val, &iresult[i], utc):
-            continue
+            if parse_today_now(val, &iresult[i], utc):
+                continue
 
-        # Some ISO formats can't be parsed by string_to_dts
-        # For example, 6-digit YYYYMD. So, if there's an error,
-        # try the string-matching code below.
+            # Some ISO formats can't be parsed by string_to_dts
+            # For example, 6-digit YYYYMD. So, if there's an error,
+            # try the string-matching code below.
 
-        # exact matching
-        if exact:
-            found = format_regex.match(val)
-            if not found:
-                if is_coerce:
-                    iresult[i] = NPY_NAT
-                    continue
-                raise ValueError(f"time data \"{val}\" at position {i} doesn't "
-                                 f"match format \"{fmt}\"")
-            if len(val) != found.end():
-                if is_coerce:
-                    iresult[i] = NPY_NAT
-                    continue
-                raise ValueError(
-                    f"unconverted data remains at position {i}: "
-                    f'"{val[found.end():]}"'
-                )
+            # exact matching
+            if exact:
+                found = format_regex.match(val)
+                if not found:
+                    raise ValueError(f"time data \"{val}\" at position {i} doesn't "
+                                     f"match format \"{fmt}\"")
+                if len(val) != found.end():
+                    raise ValueError(
+                        f"unconverted data remains at position {i}: "
+                        f'"{val[found.end():]}"'
+                    )
 
             # search
             else:

pandas/tests/tools/test_to_datetime.py

@@ -132,7 +132,9 @@ def test_to_datetime_format_YYYYMMDD_with_nat(self, cache):
         # string with NaT
         ser2 = ser.apply(str)
         ser2[2] = "nat"
-        with pytest.raises(ValueError, match="unconverted data remains: .0"):
+        with pytest.raises(
+            ValueError, match='unconverted data remains at position 0: ".0'
+        ):
             # https://github.com/pandas-dev/pandas/issues/50051
             to_datetime(ser2, format="%Y%m%d", cache=cache)
 
@@ -2066,8 +2068,8 @@ def test_to_datetime_iso8601_fails(self, input, format, exact):
         with pytest.raises(
             ValueError,
             match=(
-                rf"time data '{input}' does not match format "
-                rf"\'{format}\' \((match|search)\) at position 0"
+                rf"time data \"{input}\" at position 0 doesn't match format "
+                rf"\"{format}\""
             ),
         ):
             to_datetime(input, format=format, exact=exact)
@@ -2085,10 +2087,13 @@ def test_to_datetime_iso8601_fails(self, input, format, exact):
     def test_to_datetime_iso8601_exact_fails(self, input, format):
         # https://github.com/pandas-dev/pandas/issues/12649
         # `format` is shorter than the date string, so only fails with `exact=True`
-        with pytest.raises(
-            ValueError,
-            match="(unconverted data remains: |does not match format).* at position 0",
-        ):
+        msg = "|".join(
+            [
+                '^unconverted data remains at position 0: ".*"$',
+                '^time data "0" at position 0 doesn\'t match format ".*"$',
+            ]
+        )
+        with pytest.raises(ValueError, match=msg):
             to_datetime(input, format=format)
 
     @pytest.mark.parametrize(
@@ -2124,8 +2129,8 @@ def test_to_datetime_iso8601_separator(self, input, format):
         with pytest.raises(
             ValueError,
             match=(
-                rf"time data '{input}' does not match format "
-                rf"'{format}' \(match\) at position 0"
+                rf"time data \"{input}\" at position 0 doesn\'t match format "
+                rf"\"{format}\""
             ),
         ):
             to_datetime(input, format=format)
@@ -2683,7 +2688,12 @@ def test_day_not_in_month_raise(self, cache):
 
     @pytest.mark.parametrize("arg", ["2015-02-29", "2015-02-32", "2015-04-31"])
     def test_day_not_in_month_raise_value(self, cache, arg):
-        msg = "(day is out of range for month|unconverted data remains).* at position 0"
+        msg = "|".join(
+            [
+                "^day is out of range for month$",
+                '^unconverted data remains at position 0: "2"$',
+            ]
+        )
         with pytest.raises(ValueError, match=msg):
             to_datetime(arg, errors="raise", format="%Y-%m-%d", cache=cache)