mirror of https://github.com/python/cpython.git
[3.11] gh-109017: Use non alternate name for Kyiv (GH-109251) (GH-111279)
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 46407fe79c
)
Co-authored-by: Jochen Sprickerhof <github@jochen.sprickerhof.de>
This commit is contained in:
parent
ff7dc61643
commit
652d3f33fb
|
@ -5,6 +5,7 @@
|
|||
import unittest
|
||||
import sys
|
||||
import os.path
|
||||
import zoneinfo
|
||||
|
||||
class DateTimeTests(unittest.TestCase):
|
||||
|
||||
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue