X Tutup
Skip to content

bpo-46124: Update zoneinfo to rely on importlib.resources traversable API. #30190

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
miss-islington merged 3 commits into from
Jan 21, 2022
Merged

bpo-46124: Update zoneinfo to rely on importlib.resources traversable API. #30190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e110bf9
bpo-46124: Update zoneinfo to rely on importlib.resources traversable…
jaraco Dec 18, 2021
e650eb2
Update Misc/NEWS.d/next/Library/2021-12-18-18-41-30.bpo-46124.ESPrb7.rst
jaraco Dec 21, 2021
dd4c246
Prefer resources namespace for context.
jaraco Dec 28, 2021
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
4 changes: 2 additions & 2 deletions Lib/zoneinfo/_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@


def load_tzdata(key):
import importlib.resources
from importlib import resources

components = key.split("/")
package_name = ".".join(["tzdata.zoneinfo"] + components[:-1])
resource_name = components[-1]

try:
return importlib.resources.open_binary(package_name, resource_name)
return resources.files(package_name).joinpath(resource_name).open("rb")
except (ImportError, FileNotFoundError, UnicodeEncodeError):
# There are three types of exception that can be raised that all amount
# to "we cannot find this key":
Expand Down
2 changes: 1 addition & 1 deletion Lib/zoneinfo/_tzpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def available_timezones():
# Start with loading from the tzdata package if it exists: this has a
# pre-assembled list of zones that only requires opening one file.
try:
with resources.open_text("tzdata", "zones") as f:
with resources.files("tzdata").joinpath("zones").open("r") as f:
for zone in f:
zone = zone.strip()
if zone:
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2021-12-18-18-41-30.bpo-46124.ESPrb7.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update :mod:`zoneinfo` to rely on importlib.resources traversable API.
X Tutup