mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Beefed up timezone support. UTC and GMT are now always recognized timezones

Browse source 
with values of 0.  Also now check time.daylight to see if time.tzname[1]
should be used in timezone checking.
This commit is contained in:
Brett Cannon 2003-05-11 06:23:36 +00:00
parent c2409b4f5a
commit 172d9ef47e
2 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/test/test_strptime.py
View file

@ -58,9 +58,11 @@ class LocaleTime_Tests(unittest.TestCase):
def test_timezone(self):
# Make sure timezone is correct
if time.strftime("%Z", self.time_tuple):
self.compare_against_time(self.LT_ins.timezone, '%Z', 8,
"Testing against timezone failed")
timezone = time.strftime("%Z", self.time_tuple)
if timezone:
self.failUnless(timezone in self.LT_ins.timezone,
"timezone %s not found in %s" %
(timezone, self.LT_ins.timezone))
def test_date_time(self):
# Check that LC_date_time, LC_date, and LC_time are correct
@ -293,18 +295,25 @@ class StrptimeTests(unittest.TestCase):
# When gmtime() is used with %Z, entire result of strftime() is empty.
# Check for equal timezone names deals with bad locale info when this
# occurs; first found in FreeBSD 4.4.
strp_output = _strptime.strptime("UTC", "%Z")
self.failUnlessEqual(strp_output.tm_isdst, 0)
strp_output = _strptime.strptime("GMT", "%Z")
self.failUnlessEqual(strp_output.tm_isdst, 0)
if time.daylight:
strp_output = _strptime.strptime(time.tzname[1], "%Z")
self.failUnlessEqual(strp_output[8], 1)
time_tuple = time.localtime()
strf_output = time.strftime("%Z") #UTC does not have a timezone
strp_output = _strptime.strptime(strf_output, "%Z")
locale_time = _strptime.LocaleTime()
if locale_time.timezone[0] != locale_time.timezone[1]:
if time.tzname[0] != time.tzname[1]:
self.failUnless(strp_output[8] == time_tuple[8],
"timezone check failed; '%s' -> %s != %s" %
(strf_output, strp_output[8], time_tuple[8]))
else:
self.failUnless(strp_output[8] == -1,
"LocaleTime().timezone has duplicate values but "
"timzone value not set to 0")
"timzone value not set to -1")
def test_date_time(self):
# Test %c directive