(original) (raw)

changeset: 76644:90b9781ccb5f branch: 3.2 parent: 76635:9f57d66689ca user: Alexander Belopolsky alexander.belopolsky@gmail.com date: Sun Apr 29 15:56:49 2012 -0400 files: Lib/imaplib.py Lib/test/support.py Lib/test/test_imaplib.py Misc/ACKS Misc/NEWS description: Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near the DST transition. Patch by Joe Peterson. diff -r 9f57d66689ca -r 90b9781ccb5f Lib/imaplib.py --- a/Lib/imaplib.py Sun Apr 29 18:34:40 2012 +0100 +++ b/Lib/imaplib.py Sun Apr 29 15:56:49 2012 -0400 @@ -22,7 +22,7 @@ __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 @@ zone = -zone tt = (year, mon, day, hour, min, sec, -1, -1, -1) - - utc = time.mktime(tt) - - # Following is necessary because the time module has no 'mkgmtime'. - # 'mktime' assumes arg in local timezone, so adds timezone/altzone. + utc = calendar.timegm(tt) - zone - 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) diff -r 9f57d66689ca -r 90b9781ccb5f Lib/test/support.py --- a/Lib/test/support.py Sun Apr 29 18:34:40 2012 +0100 +++ b/Lib/test/support.py Sun Apr 29 15:56:49 2012 -0400 @@ -53,7 +53,7 @@ "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", + "import_fresh_module", "failfast", "run_with_tz" ] class Error(Exception): @@ -1021,6 +1021,35 @@ 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): + if 'TZ' in os.environ: + orig_tz = os.environ['TZ'] + else: + orig_tz = None + os.environ['TZ'] = tz + time.tzset() + + # now run the function, resetting the tz on exceptions + try: + return func(*args, **kwds) + finally: + if orig_tz == None: + del os.environ['TZ'] + else: + os.environ['TZ'] = orig_tz + time.tzset() + + inner.__name__ = func.__name__ + inner.__doc__ = func.__doc__ + return inner + return decorator + +#======================================================================= # Big-memory-test support. Separate from 'resources' because memory use # should be configurable. diff -r 9f57d66689ca -r 90b9781ccb5f Lib/test/test_imaplib.py --- a/Lib/test/test_imaplib.py Sun Apr 29 18:34:40 2012 +0100 +++ b/Lib/test/test_imaplib.py Sun Apr 29 15:56:49 2012 -0400 @@ -11,7 +11,7 @@ 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 @@ 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( + b'25 (INTERNALDATE "02-Apr-2000 02:30:00 +0000")'), + imaplib.Internaldate2tuple( + b'25 (INTERNALDATE "02-Apr-2000 03:30:00 +0000")')) + 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 diff -r 9f57d66689ca -r 90b9781ccb5f Misc/ACKS --- a/Misc/ACKS Sun Apr 29 18:34:40 2012 +0100 +++ b/Misc/ACKS Sun Apr 29 15:56:49 2012 -0400 @@ -702,6 +702,7 @@ Alexandre Parenteau Dan Parisien Harri Pasanen +Joe Peterson Randy Pausch Samuele Pedroni Marcel van der Peijl diff -r 9f57d66689ca -r 90b9781ccb5f Misc/NEWS --- a/Misc/NEWS Sun Apr 29 18:34:40 2012 +0100 +++ b/Misc/NEWS Sun Apr 29 15:56:49 2012 -0400 @@ -56,6 +56,9 @@ Library ------- +- Issue #10941: Fix imaplib.Internaldate2tuple to produce correct result near + the DST transition. Patch by Joe Peterson. + - Issue #9154: Fix parser module to understand function annotations. - Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a /alexander.belopolsky@gmail.com