mirror of https://github.com/python/cpython
bpo-43295: Fix error handling of datetime.strptime format string '%z' (GH-24627)
Previously, `datetime.strptime` would match `'z'` with the format string `'%z'` (for UTC offsets), throwing an `IndexError` by erroneously trying to parse `'z'` as a timestamp. As a special case, `'%z'` matches the string `'Z'` which is equivalent to the offset `'+00:00'`, however this behavior is not defined for lowercase `'z'`. This change ensures a `ValueError` is thrown when encountering the original example, as follows: ``` >>> from datetime import datetime >>> datetime.strptime('z', '%z') ValueError: time data 'z' does not match format '%z' ``` Automerge-Triggered-By: GH:pganssle
This commit is contained in:
parent
3b4b2cf418
commit
04f6fbb696
|
@ -201,7 +201,7 @@ class TimeRE(dict):
|
|||
#XXX: Does 'Y' need to worry about having less or more than
|
||||
# 4 digits?
|
||||
'Y': r"(?P<Y>\d\d\d\d)",
|
||||
'z': r"(?P<z>[+-]\d\d:?[0-5]\d(:?[0-5]\d(\.\d{1,6})?)?|Z)",
|
||||
'z': r"(?P<z>[+-]\d\d:?[0-5]\d(:?[0-5]\d(\.\d{1,6})?)?|(?-i:Z))",
|
||||
'A': self.__seqToRE(self.locale_time.f_weekday, 'A'),
|
||||
'a': self.__seqToRE(self.locale_time.a_weekday, 'a'),
|
||||
'B': self.__seqToRE(self.locale_time.f_month[1:], 'B'),
|
||||
|
|
|
@ -2609,6 +2609,7 @@ class TestDateTime(TestDate):
|
|||
|
||||
with self.assertRaises(ValueError): strptime("-2400", "%z")
|
||||
with self.assertRaises(ValueError): strptime("-000", "%z")
|
||||
with self.assertRaises(ValueError): strptime("z", "%z")
|
||||
|
||||
def test_strptime_single_digit(self):
|
||||
# bpo-34903: Check that single digit dates and times are allowed.
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
:meth:`datetime.datetime.strptime` now raises ``ValueError`` instead of
|
||||
``IndexError`` when matching ``'z'`` with the ``%z`` format specifier.
|
Loading…
Reference in New Issue