[Python-checkins] python/dist/src/Lib/test test_strptime.py,1.16,1.17

bcannon@users.sourceforge.net bcannon@users.sourceforge.net
Thu, 03 Jul 2003 12:59:59 -0700


Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv7713/Lib/test

Modified Files:
	test_strptime.py 
Log Message:
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.


Index: test_strptime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_strptime.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** test_strptime.py	30 Jun 2003 19:22:12 -0000	1.16
--- test_strptime.py	3 Jul 2003 19:59:57 -0000	1.17
***************
*** 304,308 ****
          strp_output = _strptime.strptime(strf_output, "%Z")
          locale_time = _strptime.LocaleTime()
!         if time.tzname[0] != time.tzname[1]:
              self.failUnless(strp_output[8] == time_tuple[8],
                              "timezone check failed; '%s' -> %s != %s" %
--- 304,308 ----
          strp_output = _strptime.strptime(strf_output, "%Z")
          locale_time = _strptime.LocaleTime()
!         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" %
***************
*** 310,315 ****
          else:
              self.failUnless(strp_output[8] == -1,
!                             "LocaleTime().timezone has duplicate values but "
!                              "timezone value not set to -1")
  
      def test_date_time(self):
--- 310,315 ----
          else:
              self.failUnless(strp_output[8] == -1,
!                             "LocaleTime().timezone has duplicate values and "
!                              "time.daylight but timezone value not set to -1")
  
      def test_date_time(self):