[Python-checkins] cpython (merge 3.4 -> default): Issue #22165: merge from 3.4

ned.deily python-checkins at python.org
Mon Jan 5 10:06:45 CET 2015


https://hg.python.org/cpython/rev/85258e08b69b
changeset:   94027:85258e08b69b
parent:      94025:f374e4e6d04b
parent:      94026:1bc41bbbe02d
user:        Ned Deily <nad at acm.org>
date:        Mon Jan 05 01:05:36 2015 -0800
summary:
  Issue #22165: merge from 3.4

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


diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -269,6 +269,7 @@
             self.assertEqual(data, body)
         return body
 
+    @support.requires_mac_ver(10, 5)
     @unittest.skipUnless(support.TESTFN_UNDECODABLE,
                          'need support.TESTFN_UNDECODABLE')
     def test_undecodable_filename(self):

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


More information about the Python-checkins mailing list