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

jaraco · jaraco · commit 9473c0028f55 · 2021-12-18T18:41:33.000-05:00
diff --git a/Lib/zoneinfo/_common.py b/Lib/zoneinfo/_common.py
@@ -2,14 +2,14 @@
 
 
 def load_tzdata(key):
-    import importlib.resources
+    from importlib.resources import files
 
     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 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":
diff --git a/Lib/zoneinfo/_tzpath.py b/Lib/zoneinfo/_tzpath.py
@@ -111,14 +111,14 @@ def available_timezones():
         determine if a given file on the time zone search path is to open it
         and check for the "magic string" at the beginning.
     """
-    from importlib import resources
+    from importlib.resources import files
 
     valid_zones = set()
 
     # 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 files("tzdata").joinpath("zones").open() as f:
             for zone in f:
                 zone = zone.strip()
                 if zone:
diff --git a/Misc/NEWS.d/next/Library/2021-12-18-18-41-30.bpo-46124.ESPrb7.rst b/Misc/NEWS.d/next/Library/2021-12-18-18-41-30.bpo-46124.ESPrb7.rst
@@ -0,0 +1 @@
+Update zoneinfo to rely on importlib.resources traversable API.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Update zoneinfo to rely on importlib.resources traversable API.`