From a07548e97bd819884ed1ddcfedb0fcbcbfdc58fe Mon Sep 17 00:00:00 2001 From: Alexander Belopolsky Date: Thu, 21 Jun 2012 20:34:09 -0400 Subject: Issue #14653: email.utils.mktime_tz() no longer relies on system mktime() when timezone offest is supplied. --- Lib/email/_parseaddr.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Lib/email/_parseaddr.py') diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py index a295757281..79573c6177 100644 --- a/Lib/email/_parseaddr.py +++ b/Lib/email/_parseaddr.py @@ -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): -- cgit v1.2.1