(neither to 2.6)

Merged revisions 76012 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76012 | antoine.pitrou | 2009-11-01 17:10:47 +0100 (dim., 01 nov. 2009) | 3 lines

  Hum, test skipping when the URL isn't reachable hadn't been applied to trunk.
........

diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py
index 60557640be3f5745c2f8e45e0948d4cbda33d78c..feefa9733e65e783092301c4dd8dc50c891f47f1 100644 (file)
--- a/Lib/test/test_multibytecodec_support.py
+++ b/Lib/test/test_multibytecodec_support.py
@@ -266,7 +266,10 @@ class TestBase_Mapping(unittest.TestCase):
 
     def __init__(self, *args, **kw):
         unittest.TestCase.__init__(self, *args, **kw)
-        self.open_mapping_file() # test it to report the error early
+        try:
+            self.open_mapping_file() # test it to report the error early
+        except IOError:
+            raise test_support.TestSkipped("Could not retrieve "+self.mapfileurl)
 
     def open_mapping_file(self):
         return test_support.open_urlresource(self.mapfileurl)