diff options
| author | Brett Cannon <bcannon@gmail.com> | 2004-03-07 23:16:27 +0000 |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2004-03-07 23:16:27 +0000 |
| commit | 12c4586a8509447ef5b3757d24c4dbf76f30deb8 (patch) | |
| tree | 149a0856b99af42e4a38cf0f22b4874394936fb3 /Lib/_strptime.py | |
| parent | 969d80d1ecb1229f85c0c356b1bf693037bf35b2 (diff) | |
| download | cpython-12c4586a8509447ef5b3757d24c4dbf76f30deb8.tar.gz | |
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 .
Diffstat (limited to 'Lib/_strptime.py')
| -rw-r--r-- | Lib/_strptime.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/_strptime.py b/Lib/_strptime.py index e93d146827..361f52e2dd 100644 --- a/Lib/_strptime.py +++ b/Lib/_strptime.py @@ -363,8 +363,8 @@ def strptime(data_string, format="%a %b %d %H:%M:%S %Y"): # Deal with bad locale setup where timezone names are the # 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: + if (time.tzname[0] == time.tzname[1] and + time.daylight and found_zone not in ("utc", "gmt")): break else: tz = value |