diff options
author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2012-06-22 00:34:09 (GMT) |
---|---|---|
committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2012-06-22 00:34:09 (GMT) |
commit | a07548e97bd819884ed1ddcfedb0fcbcbfdc58fe (patch) | |
tree | 8b48da4855caf7c49af6246ea74a68ad263a6cd4 | |
parent | 9ed8b4e4cac4f38109c3e08a8bfd19b7f6ad1c88 (diff) | |
download | cpython-a07548e97bd819884ed1ddcfedb0fcbcbfdc58fe.zip cpython-a07548e97bd819884ed1ddcfedb0fcbcbfdc58fe.tar.gz cpython-a07548e97bd819884ed1ddcfedb0fcbcbfdc58fe.tar.bz2 |
Issue #14653: email.utils.mktime_tz() no longer relies on system
mktime() when timezone offest is supplied.
-rw-r--r-- | Lib/email/_parseaddr.py | 8 | ||||
-rw-r--r-- | Lib/email/test/test_email.py | 6 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 13 insertions, 4 deletions
diff --git a/Lib/email/_parseaddr.py b/Lib/email/_parseaddr.py index a295757..79573c6 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): diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 5db34dc..65b3ebd 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -2585,6 +2585,12 @@ class TestMiscellaneous(TestEmailBase): eq(time.localtime(t)[:6], timetup[:6]) eq(int(time.strftime('%Y', timetup[:9])), 2003) + def test_mktime_tz(self): + self.assertEqual(utils.mktime_tz((1970, 1, 1, 0, 0, 0, + -1, -1, -1, 0)), 0) + self.assertEqual(utils.mktime_tz((1970, 1, 1, 0, 0, 0, + -1, -1, -1, 1234)), -1234) + def test_parsedate_y2k(self): """Test for parsing a date with a two-digit year. @@ -73,6 +73,9 @@ Core and Builtins Library ------- +- Issue #14653: email.utils.mktime_tz() no longer relies on system + mktime() when timezone offest is supplied. + - Fix GzipFile's handling of filenames given as bytes objects. - Issue #15101: Make pool finalizer avoid joining current thread. |