diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-10-24 17:44:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-24 17:44:46 (GMT) |
| commit | b6e508cc86e8a6a22efc34dd86249b876a0558e7 (patch) | |
| tree | 0ac807102325449977c47b5176b7040043c8a79f | |
| parent | b180120468c100e8c77696ed90b892db59c699c7 (diff) | |
| download | cpython-b6e508cc86e8a6a22efc34dd86249b876a0558e7.zip cpython-b6e508cc86e8a6a22efc34dd86249b876a0558e7.tar.gz cpython-b6e508cc86e8a6a22efc34dd86249b876a0558e7.tar.bz2 | |
[3.12] gh-109017: Use non alternate name for Kyiv (GH-109251) (GH-111280)
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.
Also check that the new name is actually available.
(cherry picked from commit 46407fe79ca78051cbf6c80e8b8e70a228f9fa50)
Co-authored-by: Jochen Sprickerhof <github@jochen.sprickerhof.de>
| -rw-r--r-- | Lib/test/test_email/test_utils.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py index 25fa48c..c9d973d 100644 --- a/Lib/test/test_email/test_utils.py +++ b/Lib/test/test_email/test_utils.py @@ -5,6 +5,7 @@ import time import unittest import sys import os.path +import zoneinfo class DateTimeTests(unittest.TestCase): @@ -142,13 +143,9 @@ class LocaltimeTests(unittest.TestCase): t2 = utils.localtime(t0.replace(tzinfo=None)) self.assertEqual(t1, t2) - # XXX: Need a more robust test for Olson's tzdata - @unittest.skipIf(sys.platform.startswith('win'), - "Windows does not use Olson's TZ database") - @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') + @unittest.skipUnless("Europe/Kyiv" in zoneinfo.available_timezones(), + "Can't find a Kyiv timezone database") + @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) |