Skip to content

[3.12] gh-109017: Use non alternate name for Kyiv (GH-109251) #111280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 1 commit into from
Oct 24, 2023
Merged

[3.12] gh-109017: Use non alternate name for Kyiv (GH-109251) #111280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-109017: Use non alternate name for Kyiv (GH-109251) 
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 46407fe)

Co-authored-by: Jochen Sprickerhof <[email protected]>
  • Loading branch information
@jspricke @miss-islington
jspricke authored and miss-islington committed Oct 24, 2023
commit 1b562943606cbdca89cf4f0415ceb2128eaa6366
11 changes: 4 additions & 7 deletions Lib/test/test_email/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import unittest
import sys
import os.path
import zoneinfo

class DateTimeTests(unittest.TestCase):

Expand Down Expand Up @@ -142,13 +143,9 @@ def test_localtime_epoch_notz_daylight_false(self):
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)
Expand Down