From d22604a6d1237c42ec5f43df51dfa9aa58240ba4 Mon Sep 17 00:00:00 2001 From: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Date: Mon, 14 Apr 2025 18:07:51 +0100 Subject: [PATCH] gh-85702: Catch IsADirectoryError in zoneinfo (#131333) Co-authored-by: Victor Stinner --- Lib/test/test_zoneinfo/test_zoneinfo.py | 1 + Lib/zoneinfo/_common.py | 3 ++- .../next/Library/2025-03-16-17-40-00.gh-issue-85702.qudq12.rst | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2025-03-16-17-40-00.gh-issue-85702.qudq12.rst diff --git a/Lib/test/test_zoneinfo/test_zoneinfo.py b/Lib/test/test_zoneinfo/test_zoneinfo.py index 841472155573..102a487b4cfa 100644 --- a/Lib/test/test_zoneinfo/test_zoneinfo.py +++ b/Lib/test/test_zoneinfo/test_zoneinfo.py @@ -222,6 +222,7 @@ class ZoneInfoTest(TzPathUserMixin, ZoneInfoTestBase): "America.Los_Angeles", "🇨🇦", # Non-ascii "America/New\ud800York", # Contains surrogate character + "Europe", # Is a directory, see issue gh-85702 ] for bad_key in bad_keys: diff --git a/Lib/zoneinfo/_common.py b/Lib/zoneinfo/_common.py index 98cdfe37ca6c..6e05abc32394 100644 --- a/Lib/zoneinfo/_common.py +++ b/Lib/zoneinfo/_common.py @@ -10,7 +10,7 @@ def load_tzdata(key): try: return resources.files(package_name).joinpath(resource_name).open("rb") - except (ImportError, FileNotFoundError, UnicodeEncodeError): + except (ImportError, FileNotFoundError, UnicodeEncodeError, IsADirectoryError): # There are three types of exception that can be raised that all amount # to "we cannot find this key": # @@ -21,6 +21,7 @@ def load_tzdata(key): # (e.g. Europe/Krasnoy) # UnicodeEncodeError: If package_name or resource_name are not UTF-8, # such as keys containing a surrogate character. + # IsADirectoryError: If package_name without a resource_name specified. raise ZoneInfoNotFoundError(f"No time zone found with key {key}") diff --git a/Misc/NEWS.d/next/Library/2025-03-16-17-40-00.gh-issue-85702.qudq12.rst b/Misc/NEWS.d/next/Library/2025-03-16-17-40-00.gh-issue-85702.qudq12.rst new file mode 100644 index 000000000000..25b549d5f083 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-03-16-17-40-00.gh-issue-85702.qudq12.rst @@ -0,0 +1,2 @@ +If ``zoneinfo._common.load_tzdata`` is given a package without a resource a +``ZoneInfoNotFoundError`` is raised rather than a :exc:`IsADirectoryError`. -- 2.47.3