gh-96463: fix load_tzdata raising OSError, not ZoneInfoNotFoundError

sobolevn · sobolevn · commit 95dcf3ed0b5f · 2022-11-19T21:56:16.000+03:00
diff --git a/Lib/test/test_zoneinfo/test_zoneinfo.py b/Lib/test/test_zoneinfo/test_zoneinfo.py
@@ -220,6 +220,7 @@ def test_bad_keys(self):
             "America.Los_Angeles",
             "🇨🇦",  # Non-ascii
             "America/New\ud800York",  # Contains surrogate character
+            "a" * 256,  # Too long
         ]
 
         for bad_key in bad_keys:
diff --git 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):  # TODO
         # There are three types of exception that can be raised that all amount
         # to "we cannot find this key":
         #
@@ -21,6 +21,8 @@ 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.
+        # OSError: If filename is wrong (too long, has invalid ascii symbols)
+        #   or when there's a permissing error.
         raise ZoneInfoNotFoundError(f"No time zone found with key {key}")
 
 
diff --git a/Misc/NEWS.d/next/Library/2022-11-19-21-55-06.gh-issue-96463.N6Woyx.rst b/Misc/NEWS.d/next/Library/2022-11-19-21-55-06.gh-issue-96463.N6Woyx.rst
@@ -0,0 +1,2 @@
+Fix :class:`zoneinfo.ZoneInfo` raising :exc:`OSError` instead of
+``ZoneInfoNotFoundError``.

Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,7 @@ def test_bad_keys(self):`
`220`	`220`	`"America.Los_Angeles",`
`221`	`221`	`"🇨🇦", # Non-ascii`
`222`	`222`	`"America/New\ud800York", # Contains surrogate character`
	`223`	`+ "a" * 256, # Too long`
`223`	`224`	`]`
`224`	`225`
`225`	`226`	`for bad_key in bad_keys:`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix :class:`zoneinfo.ZoneInfo` raising :exc:`OSError` instead of
	`2`	+``ZoneInfoNotFoundError``.