asyncio: _check_resolved_address() must also accept IPv6 without flow_info and

scope_id: (host, port).

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index 1615ecbf42add2a52206330ae1671aaa40a2d72c..80df9271b3bf429d88131d231b81a2e8dc6e3c5f 100644 (file)
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -48,7 +48,7 @@ def _check_resolved_address(sock, address):
     if family == socket.AF_INET:
         host, port = address
     elif family == socket.AF_INET6:
-        host, port, flow_info, scope_id = address
+        host, port = address[:2]
     else:
         return
 

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index f8499dc1f036157bc310dae1ca2a3ebf636aefa8..d00af23d3aa83e52b59cb6d9dcf29a22b3cbaec8 100644 (file)
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1335,11 +1335,14 @@ class EventLoopTestsMixin:
              'selector': self.loop._selector.__class__.__name__})
 
     def test_sock_connect_address(self):
-        families = [(socket.AF_INET, ('www.python.org', 80))]
+        addresses = [(socket.AF_INET, ('www.python.org', 80))]
         if support.IPV6_ENABLED:
-            families.append((socket.AF_INET6, ('www.python.org', 80, 0, 0)))
+            addresses.extend((
+                (socket.AF_INET6, ('www.python.org', 80)),
+                (socket.AF_INET6, ('www.python.org', 80, 0, 0)),
+            ))
 
-        for family, address in families:
+        for family, address in addresses:
             for sock_type in (socket.SOCK_STREAM, socket.SOCK_DGRAM):
                 sock = socket.socket(family, sock_type)
                 with sock: