mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-26 13:22:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #14653: email.utils.mktime_tz() no longer relies on system

Browse source 
mktime() when timezone offest is supplied.
This commit is contained in:
Alexander Belopolsky 2012-06-21 20:34:09 -04:00
parent 9ed8b4e4ca
commit a07548e97b
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/email/_parseaddr.py
View file

@ -13,7 +13,7 @@ __all__ = [
'quote',
]
import time
import time, calendar
SPACE = ' '
EMPTYSTRING = ''
@ -152,13 +152,13 @@ def parsedate(data):
def mktime_tz(data):
"""Turn a 10-tuple as returned by parsedate_tz() into a UTC timestamp."""
"""Turn a 10-tuple as returned by parsedate_tz() into a POSIX timestamp."""
if data[9] is None:
# No zone info, so localtime is better assumption than GMT
return time.mktime(data[:8] + (-1,))
else:
t = time.mktime(data[:8] + (0,))
return t - data[9] - time.timezone
t = calendar.timegm(data)
return t - data[9]
def quote(str):