[Python-checkins] cpython (merge 3.5 -> default): Issue #20220: Merge time zone workaround from 3.5

[martin.panter]

https://hg.python.org/cpython/rev/007235e65603
changeset:   99159:007235e65603
parent:      99158:039a370d047d
parent:      99157:364bd520d9f1
user:        Martin Panter <vadmium+py at gmail.com>
date:        Mon Nov 16 09:43:05 2015 +0000
summary:
  Issue #20220: Merge time zone workaround from 3.5

files:
  Lib/test/test_imaplib.py |  4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -54,7 +54,9 @@
                 '"18-May-2033 05:33:20 +0200"']
 
     @run_with_locale('LC_ALL', 'de_DE', 'fr_FR')
-    @run_with_tz('STD-1DST')
+    # DST rules included to work around quirk where the Gnu C library may not
+    # otherwise restore the previous time zone
+    @run_with_tz('STD-1DST,M3.2.0,M11.1.0')
     def test_Time2Internaldate(self):
         expected = '"18-May-2033 05:33:20 +0200"'
 

-- 
Repository URL: https://hg.python.org/cpython