gh-115225: Raise error on unsupported ISO 8601 time strings (#119339)

benchatt · blurb-it[bot] · web-flow · commit 14e3c7071bd1 · 2024-06-05T13:35:40.000-04:00
Some time strings that contain fractional hours or minutes are permitted
by ISO 8601, but such strings are very unlikely to be intentional. The
current parser does not parse such strings correctly or raise an error.
This change raises a ValueError when hours or minutes contain a decimal mark.

Co-authored-by: blurb-it[bot] &lt;43283697+blurb-it[bot]@users.noreply.github.com&gt;
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
@@ -4412,6 +4412,8 @@ def test_fromisoformat_fails(self):
             '12:30:45.123456-',         # Extra at end of microsecond time
             '12:30:45.123456+',         # Extra at end of microsecond time
             '12:30:45.123456+12:00:30a',    # Extra at end of full time
+            '12.5',                     # Decimal mark at end of hour
+            '12:30,5',                  # Decimal mark at end of minute
         ]
 
         for bad_str in bad_strs:
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -315,6 +315,7 @@ Greg Chapman
 Mitch Chapman
 Matt Chaput
 William Chargin
+Ben Chatterton
 Yogesh Chaudhari
 Gautam Chaudhuri
 David Chaum
diff --git a/Misc/NEWS.d/next/Library/2024-05-21-19-10-30.gh-issue-115225.eRmfJH.rst b/Misc/NEWS.d/next/Library/2024-05-21-19-10-30.gh-issue-115225.eRmfJH.rst
@@ -0,0 +1 @@
+Raise error on certain technically valid but pathological ISO 8601 strings passed to :meth:`datetime.time.fromisoformat` that were previously parsed incorrectly.
diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
@@ -1020,6 +1020,9 @@ parse_hh_mm_ss_ff(const char *tstr, const char *tstr_end, int *hour,
             continue;
         }
         else if (c == '.' || c == ',') {
+            if (i < 2) {
+                return -3; // Decimal mark on hour or minute
+            }
             break;
         } else if (!has_separator) {
             --p;

Original file line number	Diff line number	Diff line change
`@@ -4412,6 +4412,8 @@ def test_fromisoformat_fails(self):`
`4412`	`4412`	`'12:30:45.123456-', # Extra at end of microsecond time`
`4413`	`4413`	`'12:30:45.123456+', # Extra at end of microsecond time`
`4414`	`4414`	`'12:30:45.123456+12:00:30a', # Extra at end of full time`
	`4415`	`+ '12.5', # Decimal mark at end of hour`
	`4416`	`+ '12:30,5', # Decimal mark at end of minute`
`4415`	`4417`	`]`
`4416`	`4418`
`4417`	`4419`	`for bad_str in bad_strs:`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Raise error on certain technically valid but pathological ISO 8601 strings passed to :meth:`datetime.time.fromisoformat` that were previously parsed incorrectly.