[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (test_email)

victor.stinner python-checkins at python.org
Fri Sep 18 16:34:03 CEST 2015


https://hg.python.org/cpython/rev/97f853542dd6
changeset:   98058:97f853542dd6
parent:      98055:221e09b89186
parent:      98057:165d44ac7894
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Sep 18 16:33:04 2015 +0200
summary:
  Merge 3.5 (test_email)

files:
  Lib/test/test_email/test_utils.py |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -136,6 +136,9 @@
         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.
+ at test.support.requires_mac_ver(10, 7)
 class FormatDateTests(unittest.TestCase):
 
     @test.support.run_with_tz('Europe/Minsk')

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


More information about the Python-checkins mailing list