diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index e29f5e3ecb5fd4..34101f63c74364 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -3758,6 +3758,10 @@ def test_fromisoformat_fails_datetime(self): '2009-04-19T12:30:45-00:90:00', # Time zone field out from range '2009-04-19T12:30:45-00:00:90', # Time zone field out from range '2020-2020', # Ambiguous 9-char date portion + '2009-04-19T12:30:45.+05:00', # Empty fraction before offset + '2009-04-19T12:30:45.-05:00', # Empty fraction before offset + '2009-04-19T12:30:45.Z', # Empty fraction before Z + '2009-04-19T12:30:45,+05:00', # Empty fraction (comma) before offset ] for bad_str in bad_strs: @@ -5003,6 +5007,10 @@ def test_fromisoformat_fails(self): '24:01:00.000000', # Has non-zero minutes on 24:00 '12:30:45+00:90:00', # Time zone field out from range '12:30:45+00:00:90', # Time zone field out from range + '12:30:45.+05:00', # Empty fraction before offset + '12:30:45.-05:00', # Empty fraction before offset + '12:30:45.Z', # Empty fraction before Z + '12:30:45,+05:00', # Empty fraction (comma) before offset ] for bad_str in bad_strs: diff --git a/Misc/NEWS.d/next/Library/2026-06-25-07-08-17.gh-issue-152157.dt5Ef0.rst b/Misc/NEWS.d/next/Library/2026-06-25-07-08-17.gh-issue-152157.dt5Ef0.rst new file mode 100644 index 00000000000000..65042ca5aa08bf --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-06-25-07-08-17.gh-issue-152157.dt5Ef0.rst @@ -0,0 +1,5 @@ +:meth:`~datetime.datetime.fromisoformat` and :meth:`~datetime.time.fromisoformat` +now reject a decimal separator (``.`` or ``,``) that is not followed by any +fractional digit before a timezone designator, such as ``'12:34:56.+05:00'``. +The C implementation previously accepted such strings while the pure-Python +implementation correctly raised :exc:`ValueError`. diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 979aa1beb8657b..202dca5b924bff 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -1034,7 +1034,16 @@ parse_hh_mm_ss_ff(const char *tstr, const char *tstr_end, int *hour, has_separator = (c == ':'); } - if (p >= p_end) { + if (c == '.' || c == ',') { + if (i < 2) { + return -3; // Decimal mark on hour or minute + } + if (p >= p_end) { + return -3; // Decimal mark not followed by any digit + } + break; + } + else if (p >= p_end) { return c != '\0'; } else if (has_separator && (c == ':')) { @@ -1042,12 +1051,6 @@ parse_hh_mm_ss_ff(const char *tstr, const char *tstr_end, int *hour, return -4; // Malformed microsecond separator } continue; - } - else if (c == '.' || c == ',') { - if (i < 2) { - return -3; // Decimal mark on hour or minute - } - break; } else if (!has_separator) { --p; } else {