Merge 3.5 (asyncio)

1st1 · 1st1 · commit 5eef78b1131b · 2016-06-28T11:00:39.000-04:00
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
@@ -394,7 +394,8 @@ def sock_connect(self, sock, address):
         if hasattr(socket, 'AF_UNIX') and sock.family == socket.AF_UNIX:
             self._sock_connect(fut, sock, address)
         else:
-            resolved = base_events._ensure_resolved(address, loop=self)
+            resolved = base_events._ensure_resolved(
+                address, family=sock.family, proto=sock.proto, loop=self)
             resolved.add_done_callback(
                 lambda resolved: self._on_resolved(fut, sock, resolved))
 
diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
@@ -373,6 +373,17 @@ def test_sock_connect_timeout(self):
             self.loop.run_until_complete(fut)
         self.assertTrue(self.loop.remove_writer.called)
 
+    def test_sock_connect_resolve_using_socket_params(self):
+        addr = ('need-resolution.com', 8080)
+        sock = test_utils.mock_nonblocking_socket()
+        self.loop.getaddrinfo = mock.Mock()
+        self.loop.sock_connect(sock, addr)
+        while not self.loop.getaddrinfo.called:
+            self.loop._run_once()
+        self.loop.getaddrinfo.assert_called_with(
+            *addr, type=sock.type, family=sock.family, proto=sock.proto,
+            flags=0)
+
     def test__sock_connect(self):
         f = asyncio.Future(loop=self.loop)
 
