diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2015-11-16 09:42:41 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2015-11-16 09:42:41 (GMT) |
| commit | 42347100bff765db08661f9f623d85e2873b067a (patch) | |
| tree | 279c1eff8909869a72ede14c431220a3e1b4cb30 /Lib/test | |
| parent | f242aebbd31738e9ffce59d1ce557ec085e1c1c7 (diff) | |
| parent | 6e0889f0c71eebaf5814f4947b09155baa035188 (diff) | |
| download | cpython-42347100bff765db08661f9f623d85e2873b067a.zip cpython-42347100bff765db08661f9f623d85e2873b067a.tar.gz cpython-42347100bff765db08661f9f623d85e2873b067a.tar.bz2 | |
Issue #20220: Merge time zone workaround from 3.4 into 3.5
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | 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 index 8248656..07157f5 100644 --- a/Lib/test/test_imaplib.py +++ b/Lib/test/test_imaplib.py @@ -54,7 +54,9 @@ class TestImaplib(unittest.TestCase): '"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"' |