Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Doc/library/datetime.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2547,8 +2547,8 @@ requires, and these work on all platforms with a standard C implementation.
| | digits. | | |
+-----------+--------------------------------+------------------------+-------+
| ``%z`` | UTC offset in the form | (empty), +0000, | \(6) |
| | ``±HHMM[SS[.ffffff]]`` (empty | -0400, +1030, | |
| | string if the object is | +063415, | |
| | ``±HH[MM[SS[.ffffff]]]`` | -0400, +1030, | |
| | (empty string if the object is | +063415, +04, | |
| | naive). | -030712.345216 | |
+-----------+--------------------------------+------------------------+-------+
| ``%Z`` | Time zone name (empty string | (empty), UTC, GMT | \(6) |
Expand Down Expand Up @@ -2609,8 +2609,8 @@ convenience. These parameters all correspond to ISO 8601 date values.
| | Jan 4. | | |
+-----------+--------------------------------+------------------------+-------+
| ``%:z`` | UTC offset in the form | (empty), +00:00, | \(6) |
| | ``±HH:MM[:SS[.ffffff]]`` | -04:00, +10:30, | |
| | (empty string if the object is | +06:34:15, | |
| | ``±HH[:MM[:SS[.ffffff]]]`` | -04:00, +10:30, | |
| | (empty string if the object is | +06:34:15, +04, | |
| | naive). | -03:07:12.345216 | |
+-----------+--------------------------------+------------------------+-------+

Expand Down Expand Up @@ -2710,7 +2710,7 @@ Notes:

``%z``
:meth:`~.datetime.utcoffset` is transformed into a string of the form
``±HHMM[SS[.ffffff]]``, where ``HH`` is a 2-digit string giving the number
``±HH[MM[SS[.ffffff]]]``, where ``HH`` is a 2-digit string giving the number
of UTC offset hours, ``MM`` is a 2-digit string giving the number of UTC
offset minutes, ``SS`` is a 2-digit string giving the number of UTC offset
seconds and ``ffffff`` is a 6-digit string giving the number of UTC
Expand Down
8 changes: 4 additions & 4 deletions Lib/_strptime.py
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,8 @@ def __init__(self, locale_time=None):
'y': r"(?P<y>\d\d)",
'Y': r"(?P<Y>\d\d\d\d)",
# See gh-121237: "z" must support colons for backwards compatibility.
'z': r"(?P<z>([+-]\d\d:?[0-5]\d(:?[0-5]\d(\.\d{1,6})?)?)|(?-i:Z))?",
':z': r"(?P<colon_z>([+-]\d\d:[0-5]\d(:[0-5]\d(\.\d{1,6})?)?)|(?-i:Z))?",
'z': r"(?P<z>([+-]\d\d(:?[0-5]\d(:?[0-5]\d(\.\d{1,6})?)?)?)|(?-i:Z))?",
':z': r"(?P<colon_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(_fixmonths(self.locale_time.f_month[1:]), 'B'),
Expand Down Expand Up @@ -679,15 +679,15 @@ def parse_int(s):
if z == 'Z':
gmtoff = 0
else:
if z[3] == ':':
if len(z) != 3 and z[3] == ':':
z = z[:3] + z[4:]
if len(z) > 5:
if z[5] != ':':
msg = f"Inconsistent use of : in {found_dict[group_key]}"
raise ValueError(msg)
z = z[:5] + z[6:]
hours = int(z[1:3])
minutes = int(z[3:5])
minutes = int(z[3:5] or 0)
seconds = int(z[5:7] or 0)
gmtoff = (hours * 60 * 60) + (minutes * 60) + seconds
gmtoff_remainder = z[8:]
Expand Down
8 changes: 8 additions & 0 deletions Lib/test/datetimetester.py
Original file line number Diff line number Diff line change
Expand Up @@ -2901,6 +2901,10 @@ def test_strptime(self):

strptime = self.theclass.strptime

self.assertEqual(strptime("+01", "%z").utcoffset(), 1 * HOUR)
self.assertEqual(strptime("+01", "%:z").utcoffset(), 1 * HOUR)
self.assertEqual(strptime("-10", "%z").utcoffset(), -10 * HOUR)
self.assertEqual(strptime("-10", "%:z").utcoffset(), -10 * HOUR)
self.assertEqual(strptime("+0002", "%z").utcoffset(), 2 * MINUTE)
self.assertEqual(strptime("-0002", "%z").utcoffset(), -2 * MINUTE)
self.assertEqual(
Expand Down Expand Up @@ -4063,6 +4067,10 @@ def test_strptime(self):

def test_strptime_tz(self):
strptime = self.theclass.strptime
self.assertEqual(strptime("+01", "%z").utcoffset(), 1 * HOUR)
self.assertEqual(strptime("+01", "%:z").utcoffset(), 1 * HOUR)
self.assertEqual(strptime("-10", "%z").utcoffset(), -10 * HOUR)
self.assertEqual(strptime("-10", "%:z").utcoffset(), -10 * HOUR)
self.assertEqual(strptime("+0002", "%z").utcoffset(), 2 * MINUTE)
self.assertEqual(strptime("-0002", "%z").utcoffset(), -2 * MINUTE)
self.assertEqual(
Expand Down
2 changes: 2 additions & 0 deletions Lib/test/test_strptime.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,8 @@ def test_offset(self):
self.assertEqual(offset_fraction, -1)

cases = [
("-01", -one_hour, 0),
("+09", 9 * one_hour, 0),
("+01:00", one_hour, 0),
("-01:30", -(one_hour + half_hour), 0),
("-01:30:30", -(one_hour + half_hour + half_minute), 0),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Update input time zone format from ``±HHMM[SS[.ffffff]]`` to
``±HH[MM[SS[.ffffff]]]`` for :meth:`datetime.date.strptime`,
:meth:`datetime.datetime.strptime`, :meth:`datetime.time.strptime` and
:func:`time.strptime`. Patch by Semyon Moroz.
Loading