Fix test_urllib2_localnet for IPv6-only.

python · gpshead · May 17, 2021 · May 17, 2021 · May 18, 2021 · May 18, 2021
commit 0c95594cd3104dc559ced4ea8954fec1e31e0221
@@ -20,6 +20,8 @@
 
 class HTTPSServer(_HTTPServer):
 
+    address_family = socket_helper.get_family()
+
     def __init__(self, server_address, handler_class, context):
         _HTTPServer.__init__(self, server_address, handler_class)
         self.context = context

diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
@@ -9,6 +9,7 @@
 import hashlib
 
 from test.support import hashlib_helper
+from test.support import socket_helper
 from test.support import threading_helper
 from test.support import warnings_helper
 
@@ -30,6 +31,7 @@ class LoopbackHttpServer(http.server.HTTPServer):
     """HTTP server w/ a few modifications that make it useful for
     loopback testing purposes.
     """
+    address_family = socket_helper.get_family()
 
     def __init__(self, server_address, RequestHandlerClass):
         http.server.HTTPServer.__init__(self,
@@ -60,7 +62,7 @@ def __init__(self, request_handler):
         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((socket_helper.HOST, 0),
                                         request_handler)
         self.port = self.httpd.server_port
 
@@ -290,7 +292,7 @@ def http_server_with_basic_auth_handler(*args, **kwargs):
             return BasicAuthHandler(*args, **kwargs)
         self.server = LoopbackHttpServerThread(http_server_with_basic_auth_handler)
         self.addCleanup(self.stop_server)
-        self.server_url = 'http://127.0.0.1:%s' % self.server.port
+        self.server_url = f'http://{socket_helper.HOST}:{self.server.port}'
         self.server.start()
         self.server.ready.wait()
 
@@ -346,7 +348,7 @@ def create_fake_proxy_handler(*args, **kwargs):
         self.addCleanup(self.stop_server)
         self.server.start()
         self.server.ready.wait()
-        proxy_url = "http://127.0.0.1:%d" % self.server.port
+        proxy_url = f"http://{socket_helper.HOST}:{self.server.port}"
         handler = urllib.request.ProxyHandler({"http" : proxy_url})
         self.proxy_digest_handler = urllib.request.ProxyDigestAuthHandler()
         self.opener = urllib.request.build_opener(