Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near

the DST transition.  Patch by Joe Peterson.
This commit is contained in:
Alexander Belopolsky 2012-04-29 16:12:27 -04:00
commit 5a38f80f9c
5 changed files with 45 additions and 15 deletions

View file

@ -22,7 +22,7 @@ Public functions: Internaldate2tuple
__version__ = "2.58"
import binascii, errno, random, re, socket, subprocess, sys, time
import binascii, errno, random, re, socket, subprocess, sys, time, calendar
try:
import ssl
@ -1347,19 +1347,9 @@ def Internaldate2tuple(resp):
zone = -zone
tt = (year, mon, day, hour, min, sec, -1, -1, -1)
utc = calendar.timegm(tt) - zone
utc = time.mktime(tt)
# Following is necessary because the time module has no 'mkgmtime'.
# 'mktime' assumes arg in local timezone, so adds timezone/altzone.
lt = time.localtime(utc)
if time.daylight and lt[-1]:
zone = zone + time.altzone
else:
zone = zone + time.timezone
return time.localtime(utc - zone)
return time.localtime(utc)