diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-26 12:38:23 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-11-26 12:38:23 (GMT) |
| commit | 1a305fd141ebe4295d554d8b127ab982858a079e (patch) | |
| tree | 870ad72f4d33a37888a49e28600b83c584d8c61a /Lib/test/test_multibytecodec_support.py | |
| parent | 3b713b01f637e10ad4353b272703a5144d017321 (diff) | |
| download | cpython-1a305fd141ebe4295d554d8b127ab982858a079e.zip cpython-1a305fd141ebe4295d554d8b127ab982858a079e.tar.gz cpython-1a305fd141ebe4295d554d8b127ab982858a079e.tar.bz2 | |
Merged revisions 76535 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76535 | antoine.pitrou | 2009-11-26 13:36:30 +0100 (jeu., 26 nov. 2009) | 3 lines
When open_urlresource() fails, HTTPException is another possible error
........
Diffstat (limited to 'Lib/test/test_multibytecodec_support.py')
| -rw-r--r-- | Lib/test/test_multibytecodec_support.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_multibytecodec_support.py b/Lib/test/test_multibytecodec_support.py index e4036bf..75b3363 100644 --- a/Lib/test/test_multibytecodec_support.py +++ b/Lib/test/test_multibytecodec_support.py @@ -6,6 +6,7 @@ import sys, codecs import unittest, re +from http.client import HTTPException from test import support from io import BytesIO @@ -278,7 +279,7 @@ class TestBase_Mapping(unittest.TestCase): unittest.TestCase.__init__(self, *args, **kw) try: self.open_mapping_file() # test it to report the error early - except IOError: + except (IOError, HTTPException): self.skipTest("Could not retrieve "+self.mapfileurl) def open_mapping_file(self): |