Skip to content

gh-109017: Use non alternate name for Kyiv #109251

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 5 commits into from
Oct 24, 2023
+4 −7
Merged

gh-109017: Use non alternate name for Kyiv #109251

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b10798b
gh-109017: Use non alternate name for Kyiv
jspricke Aug 29, 2023
2510b90
Update Lib/test/test_email/test_utils.py
serhiy-storchaka Sep 11, 2023
d12532a
Merge branch 'main' into fix_kyiv
serhiy-storchaka Sep 12, 2023
496d9c3
Merge branch 'main' into fix_kyiv
AA-Turner Sep 21, 2023
fff7bb4
Merge branch 'main' into fix_kyiv
serhiy-storchaka Oct 24, 2023
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
Next Next commit
gh-109017: Use non alternate name for Kyiv 
tzdata provides Kiev as an alternative to Kyiv:

https://sources.debian.org/src/tzdata/2023c-10/backward/?hl=314#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.
  • Loading branch information
@jspricke
jspricke committed Sep 11, 2023
commit b10798b9dddafef1e2f1d72667a7c27eba6cdd23
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()
Comment thread
serhiy-storchaka marked this conversation as resolved.
Outdated
"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