Convert Future-returning loop methods to coroutines.

The following event loop methods are now coroutines:

* getaddrinfo()
* sock_recv()
* sock_recv_into()
* sock_accept()
* subprocess_shell()
* subprocess_exec()

Author: 1st1

tests/test_dns.py

@@ -1,3 +1,4 @@
+import asyncio
 import socket
 import unittest
 
@@ -165,7 +166,9 @@ def test_getaddrinfo_close_loop(self):
             raise unittest.SkipTest
 
         async def run():
-            fut = self.loop.getaddrinfo('example.com', 80)
+            fut = self.loop.create_task(
+                self.loop.getaddrinfo('example.com', 80))
+            await asyncio.sleep(0, loop=self.loop)
             fut.cancel()
             self.loop.stop()
 

tests/test_sockets.py

@@ -544,7 +544,7 @@ async def kill(fut):
             fut.cancel()
 
         async def recv(sock):
-            fut = self.loop.sock_recv(sock, 10)
+            fut = self.loop.create_task(self.loop.sock_recv(sock, 10))
             await asyncio.sleep(0.1, loop=self.loop)
             self.loop.remove_reader(sock)
             sock.close()

tests/test_unix.py

@@ -461,7 +461,7 @@ class _TestSSL(tb.SSLTestCase):
     def test_create_unix_server_ssl_1(self):
         CNT = 0           # number of clients that were successful
         TOTAL_CNT = 25    # total number of clients that test will create
-        TIMEOUT = 5.0     # timeout for this test
+        TIMEOUT = 10.0    # timeout for this test
 
         A_DATA = b'A' * 1024 * 1024
         B_DATA = b'B' * 1024 * 1024

uvloop/loop.pyx

@@ -1363,17 +1363,19 @@ cdef class Loop:
 
         return future.result()
 
-    def getaddrinfo(self, object host, object port, *,
-                    int family=0, int type=0, int proto=0, int flags=0):
+    @cython.iterable_coroutine
+    async def getaddrinfo(self, object host, object port, *,
+                          int family=0, int type=0, int proto=0, int flags=0):
 
         addr = __static_getaddrinfo_pyaddr(host, port, family,
                                            type, proto, flags)
         if addr is not None:
             fut = self._new_future()
             fut.set_result([addr])
-            return fut
+            return await fut
 
-        return self._getaddrinfo(host, port, family, type, proto, flags, 1)
+        return await self._getaddrinfo(
+            host, port, family, type, proto, flags, 1)
 
     @cython.iterable_coroutine
     async def getnameinfo(self, sockaddr, int flags=0):
@@ -2102,7 +2104,8 @@ cdef class Loop:
         """Remove a writer callback."""
         self._remove_writer(fileobj)
 
-    def sock_recv(self, sock, n):
+    @cython.iterable_coroutine
+    async def sock_recv(self, sock, n):
         """Receive data from the socket.
 
         The return value is a bytes object representing the data received.
@@ -2126,9 +2129,10 @@ cdef class Loop:
             fut, sock, n)
 
         self._add_reader(sock, handle)
-        return fut
+        return await fut
 
-    def sock_recv_into(self, sock, buf):
+    @cython.iterable_coroutine
+    async def sock_recv_into(self, sock, buf):
         """Receive data from the socket.
 
         The received data is written into *buf* (a writable buffer).
@@ -2151,7 +2155,7 @@ cdef class Loop:
             fut, sock, buf)
 
         self._add_reader(sock, handle)
-        return fut
+        return await fut
 
     @cython.iterable_coroutine
     async def sock_sendall(self, sock, data):
@@ -2206,7 +2210,8 @@ cdef class Loop:
         finally:
             socket_dec_io_ref(sock)
 
-    def sock_accept(self, sock):
+    @cython.iterable_coroutine
+    async def sock_accept(self, sock):
         """Accept a connection.
 
         The socket must be bound to an address and listening for connections.
@@ -2231,7 +2236,7 @@ cdef class Loop:
             fut, sock)
 
         self._add_reader(sock, handle)
-        return fut
+        return await fut
 
     @cython.iterable_coroutine
     async def sock_connect(self, sock, address):
@@ -2390,9 +2395,10 @@ cdef class Loop:
 
         return proc, protocol
 
-    def subprocess_shell(self, protocol_factory, cmd, *,
-                         shell=True,
-                         **kwargs):
+    @cython.iterable_coroutine
+    async def subprocess_shell(self, protocol_factory, cmd, *,
+                               shell=True,
+                               **kwargs):
 
         if not shell:
             raise ValueError("shell must be True")
@@ -2401,19 +2407,20 @@ cdef class Loop:
         if shell:
             args = [b'/bin/sh', b'-c'] + args
 
-        return self.__subprocess_run(protocol_factory, args, shell=True,
-                                     **kwargs)
+        return await self.__subprocess_run(protocol_factory, args, shell=True,
+                                           **kwargs)
 
-    def subprocess_exec(self,  protocol_factory, program, *args,
-                        shell=False, **kwargs):
+    @cython.iterable_coroutine
+    async def subprocess_exec(self,  protocol_factory, program, *args,
+                              shell=False, **kwargs):
 
         if shell:
             raise ValueError("shell must be False")
 
         args = list((program,) + args)
 
-        return self.__subprocess_run(protocol_factory, args, shell=False,
-                                     **kwargs)
+        return await self.__subprocess_run(protocol_factory, args, shell=False,
+                                           **kwargs)
 
     @cython.iterable_coroutine
     async def connect_read_pipe(self, proto_factory, pipe):