Merge 3.4 (test_email)

2015-09-18 16:32:51 +02:00 · 2015-09-18 16:32:51 +02:00 · 4b363e2701
parent 6df29ada02 53936474aa
commit 4b363e2701
1 changed files with 3 additions and 0 deletions
--- 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')