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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Trim test comments
  • Loading branch information
@tonghuaroot
tonghuaroot committed Jun 26, 2026
commit 8a6bcd27ef0a9d7d02c3ee04ff2cfb6c9cc0af02
14 changes: 3 additions & 11 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 @@ -1146,8 +1146,6 @@ def test_invalid_tzstr(self):
"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
# (accepted by the unmodified pure parser, rejected by the C
# implementation; both reject after the fix).
"AB C3",
" A B 3",
"AAA4BB B,J60/2,J300/2", # Embedded whitespace in DST
Expand Down Expand Up @@ -1229,15 +1227,9 @@ def test_invalid_tzstr(self):
self.zone_from_tzstr(invalid_tzstr)

def test_invalid_tzstr_non_ascii_abbr(self):
# A non-ASCII letter in an unquoted abbreviation is publicly reachable:
# from_file() UTF-8-decodes the footer, so b"AB\xc3\x80C3" decodes to
# "ABÀC3" and reaches the parser. The C implementation rejects it
# (Py_ISALPHA is ASCII-only); the unmodified pure parser accepted it.
#
# This case is kept out of the shared invalid_tzstrs list: the C error
# message embeds the bytes repr, which a re.escape() of the decoded
# string would not match, so each implementation is checked against
# its own message.
# A non-ASCII letter reaches the parser via from_file()'s UTF-8 decode.
# It can't use the shared invalid_tzstrs list (encode("ascii") fails and
# the C message holds the bytes repr), so check each parser's message.
tzstr = "ABÀC3"
footer = tzstr.encode("utf-8")

Expand Down
Loading