Skip to content

gh-85702: Catch PermissionError in zoneinfo.load_tzdata() #136117

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
merged 3 commits into from
Jun 30, 2025
Merged

gh-85702: Catch PermissionError in zoneinfo.load_tzdata() #136117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4dc9f4
gh-85702: Catch PermissionError in zoneinfo.load_tzdata()
vstinner Jun 30, 2025
fd9ce71
Add comment
vstinner Jun 30, 2025
5ebcb82
Update Misc/NEWS.d/next/Library/2025-06-30-11-12-24.gh-issue-85702.0L…
vstinner Jun 30, 2025
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
7 changes: 5 additions & 2 deletions Lib/zoneinfo/_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ def load_tzdata(key):
resource_name = components[-1]

try:
return resources.files(package_name).joinpath(resource_name).open("rb")
path = resources.files(package_name).joinpath(resource_name)
if path.is_dir():
raise IsADirectoryError
return path.open("rb")
except (ImportError, FileNotFoundError, UnicodeEncodeError, IsADirectoryError):
# There are three types of exception that can be raised that all amount
# There are four types of exception that can be raised that all amount
# to "we cannot find this key":
#
# ImportError: If package_name doesn't exist (e.g. if tzdata is not
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2025-06-30-11-12-24.gh-issue-85702.0Lrbwu.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
If ``zoneinfo._common.load_tzdata`` is given a package without a resource a
``ZoneInfoNotFoundError`` is raised rather than a :exc:`PermissionError`.
Patch by Victor Stinner.
Loading