cpython: 90b9781ccb5f (original) (raw)
Mercurial > cpython
changeset 76644:90b9781ccb5f 3.2
Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near the DST transition. Patch by Joe Peterson. [#10941]
| Alexander Belopolsky alexander.belopolsky@gmail.com | |
|---|---|
| date | Sun, 29 Apr 2012 15:56:49 -0400 |
| parents | 9f57d66689ca |
| children | 6e029b6c142a b7e491b9094f |
| files | Lib/imaplib.py Lib/test/support.py Lib/test/test_imaplib.py Misc/ACKS Misc/NEWS |
| diffstat | 5 files changed, 45 insertions(+), 15 deletions(-)[+] [-] Lib/imaplib.py 16 Lib/test/support.py 31 Lib/test/test_imaplib.py 9 Misc/ACKS 1 Misc/NEWS 3 |
line wrap: on
line diff
--- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -22,7 +22,7 @@ Public functions: Internaldate2tup 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 @@ -1340,19 +1340,9 @@ def Internaldate2tuple(resp): zone = -zone tt = (year, mon, day, hour, min, sec, -1, -1, -1) -
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[](#l1.25)- else:
zone = zone + time.timezone[](#l1.27)
--- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -53,7 +53,7 @@ except ImportError: "reap_children", "cpython_only", "check_impl_detail", "get_attribute", "swap_item", "swap_attr", "requires_IEEE_754", "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink",
- "import_fresh_module", "failfast", "run_with_tz" ] class Error(Exception): @@ -1021,6 +1021,35 @@ def run_with_locale(catstr, *locales): return decorator
#======================================================================= +# Decorator for running a function in a specific timezone, correctly +# resetting it afterwards. + +def run_with_tz(tz):
- def decorator(func):
def inner(*args, **kwds):[](#l2.21)if 'TZ' in os.environ:[](#l2.22)orig_tz = os.environ['TZ'][](#l2.23)else:[](#l2.24)orig_tz = None[](#l2.25)os.environ['TZ'] = tz[](#l2.26)time.tzset()[](#l2.27)
# now run the function, resetting the tz on exceptions[](#l2.29)try:[](#l2.30)return func(*args, **kwds)[](#l2.31)finally:[](#l2.32)if orig_tz == None:[](#l2.33)del os.environ['TZ'][](#l2.34)else:[](#l2.35)os.environ['TZ'] = orig_tz[](#l2.36)time.tzset()[](#l2.37)
inner.__name__ = func.__name__[](#l2.39)inner.__doc__ = func.__doc__[](#l2.40)return inner[](#l2.41)- return decorator
+ +#=======================================================================
Big-memory-test support. Separate from 'resources' because memory use
should be configurable.
--- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -11,7 +11,7 @@ import socketserver import time import calendar -from test.support import reap_threads, verbose, transient_internet +from test.support import reap_threads, verbose, transient_internet, run_with_tz import unittest try: @@ -36,6 +36,13 @@ class TestImaplib(unittest.TestCase): b'25 (INTERNALDATE "31-Dec-1999 12:30:00 -1130")') self.assertEqual(time.mktime(tt), t0)
- @run_with_tz('MST+07MDT,M4.1.0,M10.5.0')
- def test_Internaldate2tuple_issue10941(self):
self.assertNotEqual(imaplib.Internaldate2tuple([](#l3.18)b'25 (INTERNALDATE "02-Apr-2000 02:30:00 +0000")'),[](#l3.19)imaplib.Internaldate2tuple([](#l3.20)b'25 (INTERNALDATE "02-Apr-2000 03:30:00 +0000")'))[](#l3.21)
+ def test_that_Time2Internaldate_returns_a_result(self): # We can check only that it successfully produces a result, # not the correctness of the result itself, since the result
--- a/Misc/ACKS +++ b/Misc/ACKS @@ -702,6 +702,7 @@ Peter Parente Alexandre Parenteau Dan Parisien Harri Pasanen +Joe Peterson Randy Pausch Samuele Pedroni Marcel van der Peijl
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -56,6 +56,9 @@ Core and Builtins Library ------- +- Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near