]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.13] gh-114713: Revert gh-114731 (GH-133330) (#133331)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sat, 3 May 2025 08:09:54 +0000 (10:09 +0200)
committerGitHub <noreply@github.com>
Sat, 3 May 2025 08:09:54 +0000 (08:09 +0000)
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 <kirill.bast9@mail.ru>
Lib/test/test_zoneinfo/test_zoneinfo.py
Lib/zoneinfo/_tzpath.py
Misc/NEWS.d/next/Library/2025-03-09-01-09-12.gh-issue-114713.lkq9vZ.rst [deleted file]

index e4eb4e1fe3778ef0efbc3ef25616c77de6a3b664..8bcd6d2e9951b964ca00bc20eb9bed3d9d887df7 100644 (file)
@@ -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:
index 990a5c8b6a9372b1b599df0ba3a99af8dbd33884..5db17bea045d8c8882601bbeb10fa2d6af850138 100644 (file)
@@ -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 (file)
index d30975a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Handle case of an empty string passed to :class:`zoneinfo.ZoneInfo`.