Skip to content

gh-152248: Reject a POSIX TZ abbreviation with non-ASCII-letter characters in pure-Python zoneinfo #152249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StanFromIreland merged 6 commits into from
Jun 30, 2026
+26 −4
Merged

gh-152248: Reject a POSIX TZ abbreviation with non-ASCII-letter characters in pure-Python zoneinfo #152249

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c164ba
gh-152248: Reject a POSIX TZ abbreviation with non-ASCII-letter chara…
tonghuaroot Jun 26, 2026
8a6bcd2
Trim test comments
tonghuaroot Jun 26, 2026
6dd23ff
Wrap test comment to 79 columns
tonghuaroot Jun 26, 2026
bf26921
Reuse zone_from_tzstr with an encoding parameter in the non-ASCII test
tonghuaroot Jun 26, 2026
1931021
Reject an empty quoted abbreviation in the C zoneinfo parser
tonghuaroot Jun 26, 2026
1891398
Polish
StanFromIreland Jun 29, 2026
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
27 changes: 27 additions & 0 deletions Lib/test/test_zoneinfo/test_zoneinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,10 @@ def test_invalid_tzstr(self):
"+11", # Unquoted alphanumeric
"GMT,M3.2.0/2,M11.1.0/3", # Transition rule but no DST
"GMT0+11,M3.2.0/2,M11.1.0/3", # Unquoted alphanumeric in DST
# Unquoted abbreviation with embedded or leading whitespace
"AB C3",
" A B 3",
"AAA4BB B,J60/2,J300/2", # Embedded whitespace in DST
"PST8PDT,M3.2.0/2", # Only one transition rule
# Invalid offset hours
"AAA168",
Expand Down Expand Up @@ -1222,6 +1226,29 @@ def test_invalid_tzstr(self):
with self.assertRaisesRegex(ValueError, tzstr_regex):
self.zone_from_tzstr(invalid_tzstr)

def test_invalid_tzstr_non_ascii_abbr(self):
# A non-ASCII letter reaches the parser via from_file()'s UTF-8 decode.
# It needs a separate test: it can't be ASCII-encoded for the shared
# invalid_tzstrs list, and the C error message holds the bytes repr.
Comment thread
StanFromIreland marked this conversation as resolved.
Outdated
tzstr = "ABÀC3"
footer = tzstr.encode("utf-8")

def from_footer():
Comment thread
StanFromIreland marked this conversation as resolved.
Outdated
zonefile = io.BytesIO(self._tzif_header)
zonefile.seek(0, 2)
zonefile.write(b"\x0A")
zonefile.write(footer)
zonefile.write(b"\x0A")
zonefile.seek(0)
return self.klass.from_file(zonefile, key=tzstr)

if self.module is py_zoneinfo:
expected = re.escape(tzstr)
else:
expected = re.escape(repr(footer))
with self.assertRaisesRegex(ValueError, expected):
from_footer()

@classmethod
def _populate_test_cases(cls):
# This method uses a somewhat unusual style in that it populates the
Expand Down
4 changes: 2 additions & 2 deletions Lib/zoneinfo/_zoneinfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,11 +640,11 @@ def _parse_tz_str(tz_str):

parser_re = re.compile(
r"""
(?P<std>[^<0-9:.+-]+|<[a-zA-Z0-9+-]+>)
(?P<std>[a-zA-Z]+|<[a-zA-Z0-9+-]+>)
Comment thread
StanFromIreland marked this conversation as resolved.
(?:
(?P<stdoff>[+-]?\d{1,3}(?::\d{2}(?::\d{2})?)?)
(?:
(?P<dst>[^0-9:.+-]+|<[a-zA-Z0-9+-]+>)
(?P<dst>[a-zA-Z]+|<[a-zA-Z0-9+-]+>)
(?P<dstoff>[+-]?\d{1,3}(?::\d{2}(?::\d{2})?)?)?
)? # dst
)? # stdoff
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2026-06-26-13-39-11.gh-issue-152248.N2Rmaf.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix the pure-Python :mod:`zoneinfo` parser accepting an unquoted POSIX TZ
abbreviation that contains characters other than ASCII letters (for example an
embedded space), which the C implementation already rejects. Patch by
tonghuaroot.
Loading