mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
Fixes bug of timezone value being left as -1 when ``time.tzname[0] ==
time.tzname[1] and not time.daylight`` is true when it should only when time.daylight is true. Tests are also fixed. Closes bug #763047 and its cohort #763052.
This commit is contained in:
parent
ebab26a709
commit
cde2200ff2
2 changed files with 8 additions and 7 deletions
|
@ -303,14 +303,14 @@ class StrptimeTests(unittest.TestCase):
|
|||
strf_output = time.strftime("%Z") #UTC does not have a timezone
|
||||
strp_output = _strptime.strptime(strf_output, "%Z")
|
||||
locale_time = _strptime.LocaleTime()
|
||||
if time.tzname[0] != time.tzname[1]:
|
||||
if time.tzname[0] != time.tzname[1] or not time.daylight:
|
||||
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 "
|
||||
"timezone value not set to -1")
|
||||
"LocaleTime().timezone has duplicate values and "
|
||||
"time.daylight but timezone value not set to -1")
|
||||
|
||||
def test_date_time(self):
|
||||
# Test %c directive
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue