From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Sat, 3 May 2025 08:09:54 +0000 (+0200) Subject: [3.13] gh-114713: Revert gh-114731 (GH-133330) (#133331) X-Git-Tag: v3.13.4~177 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9c0beb00d993cffa914e43fc57905b173006489;p=thirdparty%2FPython%2Fcpython.git [3.13] gh-114713: Revert gh-114731 (GH-133330) (#133331) gh-114713: Revert gh-114731 (GH-133330) Revert "gh-114713: Handle case of an empty string passed to `zoneinfo.ZoneInfo` (GH-114731)" This reverts commit 884df116d79b05d9342e05e50484d61c684ecb8b. (cherry picked from commit fe44fc4f4351bb4b457c01d94b4ae8b9eda501aa) Co-authored-by: Kirill Podoprigora --- diff --git a/Lib/test/test_zoneinfo/test_zoneinfo.py b/Lib/test/test_zoneinfo/test_zoneinfo.py index e4eb4e1fe377..8bcd6d2e9951 100644 --- a/Lib/test/test_zoneinfo/test_zoneinfo.py +++ b/Lib/test/test_zoneinfo/test_zoneinfo.py @@ -235,7 +235,6 @@ class ZoneInfoTest(TzPathUserMixin, ZoneInfoTestBase): "../zoneinfo/America/Los_Angeles", # Traverses above TZPATH "America/../America/Los_Angeles", # Not normalized "America/./Los_Angeles", - "", ] for bad_key in bad_keys: diff --git a/Lib/zoneinfo/_tzpath.py b/Lib/zoneinfo/_tzpath.py index 990a5c8b6a93..5db17bea045d 100644 --- a/Lib/zoneinfo/_tzpath.py +++ b/Lib/zoneinfo/_tzpath.py @@ -83,11 +83,6 @@ _TEST_PATH = os.path.normpath(os.path.join("_", "_"))[:-1] def _validate_tzfile_path(path, _base=_TEST_PATH): - if not path: - raise ValueError( - "ZoneInfo key must not be an empty string" - ) - if os.path.isabs(path): raise ValueError( f"ZoneInfo keys may not be absolute paths, got: {path}" diff --git a/Misc/NEWS.d/next/Library/2025-03-09-01-09-12.gh-issue-114713.lkq9vZ.rst b/Misc/NEWS.d/next/Library/2025-03-09-01-09-12.gh-issue-114713.lkq9vZ.rst deleted file mode 100644 index d30975a8a511..000000000000 --- a/Misc/NEWS.d/next/Library/2025-03-09-01-09-12.gh-issue-114713.lkq9vZ.rst +++ /dev/null @@ -1 +0,0 @@ -Handle case of an empty string passed to :class:`zoneinfo.ZoneInfo`.