Merge 3.5 (test_email)

f409c7cd · Victor Stinner · d8f432a9 · 4b363e27 · f409c7cd
Commit f409c7cd authored Sep 18, 2015 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

Lib/test/test_email/test_utils.py Lib/test/test_email/test_utils.py +3 -0

No files found.
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -136,6 +136,9 @@ class LocaltimeTests(unittest.TestCase):
        t1 = utils.localtime(t0)
        self.assertEqual(t1.tzname(), 'EET')

+# Issue #24836: The timezone files are out of date (pre 2011k)
+# on Mac OS X Snow Leopard.
+@test.support.requires_mac_ver(10, 7)
 class FormatDateTests(unittest.TestCase):

    @test.support.run_with_tz('Europe/Minsk')