diff -r a22ef88143b9 Lib/test/test_urllib2_localnet.py --- a/Lib/test/test_urllib2_localnet.py Sat Oct 25 23:05:21 2014 -0500 +++ b/Lib/test/test_urllib2_localnet.py Tue Oct 28 14:09:32 2014 +0000 @@ -1,6 +1,7 @@ import base64 import os import email +import socket import urllib.parse import urllib.request import http.server @@ -21,7 +22,7 @@ CERT_localhost = os.path.join(here, 'keycert.pem') # Self-signed cert file for 'fakehostname' CERT_fakehostname = os.path.join(here, 'keycert2.pem') - +localhost_ip = socket.gethostbyname('localhost') # Loopback http server infrastructure @@ -59,7 +60,7 @@ self._stop_server = False self.ready = threading.Event() request_handler.protocol_version = "HTTP/1.0" - self.httpd = LoopbackHttpServer(("127.0.0.1", 0), + self.httpd = LoopbackHttpServer((localhost_ip, 0), request_handler) self.port = self.httpd.server_port @@ -289,7 +290,7 @@ def http_server_with_basic_auth_handler(*args, **kwargs): return BasicAuthHandler(*args, **kwargs) self.server = LoopbackHttpServerThread(http_server_with_basic_auth_handler) - self.server_url = 'http://127.0.0.1:%s' % self.server.port + self.server_url = 'http://%s:%s' % (localhost_ip, self.server.port) self.server.start() self.server.ready.wait() @@ -315,7 +316,7 @@ @unittest.skipUnless(threading, "Threading required for this test.") class ProxyAuthTests(unittest.TestCase): - URL = "http://localhost" + URL = "http://%s" % localhost_ip USER = "tester" PASSWD = "test123" @@ -333,7 +334,7 @@ self.server = LoopbackHttpServerThread(create_fake_proxy_handler) self.server.start() self.server.ready.wait() - proxy_url = "http://127.0.0.1:%d" % self.server.port + proxy_url = "http://%s:%d" % (localhost_ip, self.server.port) handler = urllib.request.ProxyHandler({"http" : proxy_url}) self.proxy_digest_handler = urllib.request.ProxyDigestAuthHandler() self.opener = urllib.request.build_opener(