]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.11] Use non alternate name for Kyiv (GH-108533) (GH-108641)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Tue, 29 Aug 2023 15:47:54 +0000 (08:47 -0700)
committerGitHub <noreply@github.com>
Tue, 29 Aug 2023 15:47:54 +0000 (15:47 +0000)
tzdata provides Kiev as an alternative to Kyiv:

https://sources.debian.org/src/tzdata/2023c-10/backward/?hl=314GH-L314

But Debian moved it to the tzdata-legacy package breaking the test:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050530

This patch switches to the name provided by tzdata.
(cherry picked from commit 7659128b9d7a30ddbcb063bc12e2ddb0f1f119e0)

Co-authored-by: Jochen Sprickerhof <github@jochen.sprickerhof.de>
Lib/test/test_email/test_utils.py

index 78afb358035e8122cd7d76b9f7bc40d260239f60..800729a62d871f2ca17f314bbf36c218ef589130 100644 (file)
@@ -148,7 +148,7 @@ class LocaltimeTests(unittest.TestCase):
     @unittest.skipUnless(os.path.exists('/usr/share/zoneinfo') or
                          os.path.exists('/usr/lib/zoneinfo'),
                          "Can't find the Olson's TZ database")
-    @test.support.run_with_tz('Europe/Kiev')
+    @test.support.run_with_tz('Europe/Kyiv')
     def test_variable_tzname(self):
         t0 = datetime.datetime(1984, 1, 1, tzinfo=datetime.timezone.utc)
         t1 = utils.localtime(t0)