From 7c5af9acee89bed815e16f6d96bc516189238542 Mon Sep 17 00:00:00 2001 From: Kirill Podoprigora Date: Sat, 3 May 2025 10:11:50 +0300 Subject: [PATCH] Revert "gh-114713: Handle case of an empty string passed to `zoneinfo.ZoneInfo` (#114731)" This reverts commit 884df116d79b05d9342e05e50484d61c684ecb8b. --- Lib/test/test_zoneinfo/test_zoneinfo.py | 1 - Lib/zoneinfo/_tzpath.py | 5 ----- .../Library/2025-03-09-01-09-12.gh-issue-114713.lkq9vZ.rst | 1 - 3 files changed, 7 deletions(-) delete mode 100644 Misc/NEWS.d/next/Library/2025-03-09-01-09-12.gh-issue-114713.lkq9vZ.rst diff --git a/Lib/test/test_zoneinfo/test_zoneinfo.py b/Lib/test/test_zoneinfo/test_zoneinfo.py index b0dbd768cab7e1..d2845495c7f8b6 100644 --- a/Lib/test/test_zoneinfo/test_zoneinfo.py +++ b/Lib/test/test_zoneinfo/test_zoneinfo.py @@ -237,7 +237,6 @@ def test_bad_keys_paths(self): "../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 990a5c8b6a9372..5db17bea045d8c 100644 --- a/Lib/zoneinfo/_tzpath.py +++ b/Lib/zoneinfo/_tzpath.py @@ -83,11 +83,6 @@ def find_tzfile(key): 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 d30975a8a5115b..00000000000000 --- 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`.