Prefer resources namespace for context.

jaraco · pganssle · jaraco · commit dd4c2469054e · 2022-01-21T09:35:38.000-05:00
Co-authored-by: Paul Ganssle &lt;1377457+pganssle@users.noreply.github.com&gt;
diff --git a/Lib/zoneinfo/_common.py b/Lib/zoneinfo/_common.py
@@ -2,14 +2,14 @@
 
 
 def load_tzdata(key):
-    from importlib.resources import files
+    from importlib import resources
 
     components = key.split("/")
     package_name = ".".join(["tzdata.zoneinfo"] + components[:-1])
     resource_name = components[-1]
 
     try:
-        return files(package_name).joinpath(resource_name).open('rb')
+        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":
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.resources import files
+    from importlib import resources
 
     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 files("tzdata").joinpath("zones").open() as f:
+        with resources.files("tzdata").joinpath("zones").open("r") as f:
             for zone in f:
                 zone = zone.strip()
                 if zone:
