Skip to content

bpo-41530: Handle unhandled IsADirectoryError and PermissionError in zoneinfo.ZoneInfo #21839

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

Closed
wants to merge 13 commits into from
Closed

bpo-41530: Handle unhandled IsADirectoryError and PermissionError in zoneinfo.ZoneInfo #21839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
aa75c26
Add unhandled exceptions to zoneinfo._common.load_tzdata
bijij Aug 12, 2020
dbf37fd
Ensure changes follow PEP-8 specifications.
bijij Aug 12, 2020
65f2569
Remove erroneously added testing code.
bijij Aug 12, 2020
768bdb3
Remove whitespace on blank line
bijij Aug 12, 2020
4cbaa99
Remove ValueError from handled exceptions
bijij Aug 12, 2020
8ad2ec7
Fix whitespace for exception block
bijij Aug 12, 2020
0065b49
Rework to catch all OSError exceptions
bijij Aug 12, 2020
db83f0d
Remove unneccessary import guards from backport
bijij Aug 12, 2020
bbf42e3
Remove whitespace
bijij Aug 12, 2020
eafd623
Fix whitespace issue on line 34
bijij Aug 12, 2020
ff1d9ed
Restrict exceptions handled to IsADirectoryError & PermissionError
bijij Aug 13, 2020
c2e6fca
📜🤖 Added by blurb_it.
blurb-it[bot] Aug 13, 2020
814d98c
Simplify path determination
bijij Aug 13, 2020
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
15 changes: 14 additions & 1 deletion Lib/zoneinfo/_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def load_tzdata(key):
try:
return importlib.resources.open_binary(package_name, resource_name)
except (ImportError, FileNotFoundError, UnicodeEncodeError):
# There are three types of exception that can be raised that all amount
# There are some 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 All @@ -22,6 +22,19 @@ def load_tzdata(key):
# UnicodeEncodeError: If package_name or resource_name are not UTF-8,
# such as keys containing a surrogate character.
raise ZoneInfoNotFoundError(f"No time zone found with key {key}")
except (IsADirectoryError, PermissionError):
# A few exceptions inherited from OSError can be raised in various scenarios:
#
# IsADirectoryError: If the resource_name links to a directory
# (e.g. Australia)
# PermissionError: If the resource_name links to a directory on Windows
# (e.g. Pacific)
resource_path = importlib.resources.files(package_name).joinpath(key)

if resource_path.is_dir():
raise ZoneInfoNotFoundError(f"No time zone found with key {key}")
else:
raise


def load_data(fobj):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2020-08-13-01-17-31.bpo-41530.WYqwKz.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
zoneinfo ZoneInfo no longer raises IsADirectoryError or PermissionError when attempting to parse certain keys.