[Python-checkins] python/dist/src/Lib _strptime.py,1.30,1.31

[bcannon at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30852/Lib

Modified Files:
	_strptime.py 
Log Message:
Deal with possible case of having time.tzname[1] containing UTC or GMT.
Since it is known ahead of time that UTC and GMT always have no DST adjustment
then just set the isdst value to 0 even if tzname[0] == tzname[1] .
Fixes bug #897817 .


Index: _strptime.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/_strptime.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** _strptime.py	18 Jan 2004 20:29:54 -0000	1.30
--- _strptime.py	7 Mar 2004 23:16:27 -0000	1.31
***************
*** 364,369 ****
                      # same and yet time.daylight is true; too ambiguous to
                      # be able to tell what timezone has daylight savings
!                     if time.tzname[0] == time.tzname[1] and \
!                        time.daylight:
                          break
                      else:
--- 364,369 ----
                      # same and yet time.daylight is true; too ambiguous to
                      # be able to tell what timezone has daylight savings
!                     if (time.tzname[0] == time.tzname[1] and
!                        time.daylight and found_zone not in ("utc", "gmt")):
                          break
                      else: