From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 29 Mar 2013 23:33:46 +0000 (+0200)
Subject: #17564: merge with 3.3.
X-Git-Tag: v3.4.0a1~1069
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c0fc15c411b577f310613e23724e985f1d2cf73;p=thirdparty%2FPython%2Fcpython.git

#17564: merge with 3.3.
---

8c0fc15c411b577f310613e23724e985f1d2cf73
diff --cc Lib/test/test_urllib2_localnet.py
index 5880b3ab7594,b1aa1584553c..08250c36e5d6
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@@ -546,7 -524,12 +546,12 @@@ class TestUrlopen(unittest.TestCase)
      def test_bad_address(self):
          # Make sure proper exception is raised when connecting to a bogus
          # address.
+ 
+         # as indicated by the comment below, this might fail with some ISP,
+         # so we run the test only when -unetwork/-uall is specified to
+         # mitigate the problem a bit (see #17564)
+         support.requires('network')
 -        self.assertRaises(IOError,
 +        self.assertRaises(OSError,
                            # Given that both VeriSign and various ISPs have in
                            # the past or are presently hijacking various invalid
                            # domain name requests in an attempt to boost traffic