diff options
| -rw-r--r-- | Lib/test/support/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_socket.py | 10 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 39089cd..d496bd6 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -587,7 +587,7 @@ def _is_ipv6_enabled(): sock = None try: sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) - sock.bind(('::1', 0)) + sock.bind((HOSTv6, 0)) return True except OSError: pass diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index ae84dbf..f090a48 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -565,11 +565,7 @@ class SCTPStreamBase(InetTestBase): class Inet6TestBase(InetTestBase): """Base class for IPv6 socket tests.""" - # Don't use "localhost" here - it may not have an IPv6 address - # assigned to it by default (e.g. in /etc/hosts), and if someone - # has assigned it an IPv4-mapped address, then it's unlikely to - # work with the full IPv6 API. - host = "::1" + host = support.HOSTv6 class UDP6TestBase(Inet6TestBase): """Base class for UDP-over-IPv6 tests.""" @@ -1321,9 +1317,9 @@ class GeneralModuleTests(unittest.TestCase): @unittest.skipUnless(support.IPV6_ENABLED, 'IPv6 required for this test.') def test_flowinfo(self): self.assertRaises(OverflowError, socket.getnameinfo, - ('::1',0, 0xffffffff), 0) + (support.HOSTv6, 0, 0xffffffff), 0) with socket.socket(socket.AF_INET6, socket.SOCK_STREAM) as s: - self.assertRaises(OverflowError, s.bind, ('::1', 0, -10)) + self.assertRaises(OverflowError, s.bind, (support.HOSTv6, 0, -10)) @unittest.skipUnless(HAVE_SOCKET_CAN, 'SocketCan required for this test.') diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index ca8dade..b9bc932 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -4940,7 +4940,7 @@ socket_inet_aton(PyObject *self, PyObject *args) /* special-case this address as inet_addr might return INADDR_NONE * for this */ if (strcmp(ip_addr, "255.255.255.255") == 0) { - packed_addr = 0xFFFFFFFF; + packed_addr = INADDR_BROADCAST; } else { packed_addr = inet_addr(ip_addr); |