summaryrefslogtreecommitdiffstats
path: root/Lib/_strptime.py
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/_strptime.py')
-rw-r--r--Lib/_strptime.py4
1 files 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