Make loop TCP APIs accept only TCP streaming sockets

1st1 · 1st1 · commit dc3b2aff30bd · 2016-11-06T16:59:00.000-05:00
diff --git a/asyncio/base_events.py b/asyncio/base_events.py
@@ -771,9 +771,13 @@ def create_connection(self, protocol_factory, host=None, port=None, *,
                     raise OSError('Multiple exceptions: {}'.format(
                         ', '.join(str(exc) for exc in exceptions)))
 
-        elif sock is None:
-            raise ValueError(
-                'host and port was not specified and no sock specified')
+        else:
+            if sock is None:
+                raise ValueError(
+                    'host and port was not specified and no sock specified')
+            if sock.family not in {socket.AF_INET, socket.AF_INET6}:
+                raise ValueError(
+                    'A TCP Stream Socket was expected, got {!r}'.format(sock))
 
         transport, protocol = yield from self._create_connection_transport(
             sock, protocol_factory, ssl, server_hostname)
@@ -1027,6 +1031,9 @@ def create_server(self, protocol_factory, host=None, port=None,
         else:
             if sock is None:
                 raise ValueError('Neither host/port nor sock were specified')
+            if sock.family not in {socket.AF_INET, socket.AF_INET6}:
+                raise ValueError(
+                    'A TCP Stream Socket was expected, got {!r}'.format(sock))
             sockets = [sock]
 
         server = Server(self, sockets)
@@ -1048,6 +1055,9 @@ def connect_accepted_socket(self, protocol_factory, sock, *, ssl=None):
         This method is a coroutine.  When completed, the coroutine
         returns a (transport, protocol) pair.
         """
+        if sock.family not in {socket.AF_INET, socket.AF_INET6}:
+            raise ValueError(
+                'A TCP Stream Socket was expected, got {!r}'.format(sock))
         transport, protocol = yield from self._create_connection_transport(
             sock, protocol_factory, ssl, '', server_side=True)
         if self._debug:
diff --git a/tests/test_events.py b/tests/test_events.py
@@ -1377,6 +1377,11 @@ def datagram_received(self, data, addr):
         server.transport.close()
 
     def test_create_datagram_endpoint_sock(self):
+        if (sys.platform == 'win32' and
+                isinstance(self.loop, proactor_events.BaseProactorEventLoop)):
+            raise unittest.SkipTest(
+                'UCP not supported with proactor event loops')
+
         sock = None
         local_address = ('127.0.0.1', 0)
         infos = self.loop.run_until_complete(
@@ -1394,7 +1399,7 @@ def test_create_datagram_endpoint_sock(self):
         else:
             assert False, 'Can not create socket.'
 
-        f = self.loop.create_connection(
+        f = self.loop.create_datagram_endpoint(
             lambda: MyDatagramProto(loop=self.loop), sock=sock)
         tr, pr = self.loop.run_until_complete(f)
         self.assertIsInstance(tr, asyncio.Transport)
