From 8172ac3d15a78d0a7a716465b5ce6d9f63434a08 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Sun, 7 Mar 2004 23:16:27 +0000 Subject: 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 . --- Lib/_strptime.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/_strptime.py b/Lib/_strptime.py index e93d146..361f52e 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 -- cgit v0.12