Upgrade to Cython 0.28.2

Use new @cython.iterable_coroutine instead of patching the
generated C code.

Fixes issue #122.

requirements.dev.txt

@@ -1,2 +1,2 @@
-Cython==0.27.3
+Cython==0.28.2
 Sphinx>=1.4.1

setup.py

@@ -139,80 +139,10 @@ def finalize_options(self):
                 compiler_directives=directives,
                 annotate=self.cython_annotate)
 
-            for cfile, timestamp in cfiles.items():
-                if os.path.getmtime(cfile) != timestamp:
-                    # The file was recompiled, patch
-                    self._patch_cfile(cfile)
-
         super().finalize_options()
 
         self._initialized = True
 
-    def _patch_cfile(self, cfile):
-        # Patch Cython 'async def' coroutines to have a 'tp_iter'
-        # slot, which makes them compatible with 'yield from' without
-        # the `asyncio.coroutine` decorator.
-
-        with open(cfile, 'rt') as f:
-            src = f.read()
-
-        src = re.sub(
-            r'''
-            \s* offsetof\(__pyx_CoroutineObject,\s*gi_weakreflist\),
-            \s* 0,
-            \s* 0,
-            \s* __pyx_Coroutine_methods,
-            \s* __pyx_Coroutine_memberlist,
-            \s* __pyx_Coroutine_getsets,
-            ''',
-
-            r'''
-            offsetof(__pyx_CoroutineObject, gi_weakreflist),
-            __Pyx_Coroutine_await, /* tp_iter */
-            (iternextfunc) __Pyx_Generator_Next, /* tp_iternext */
-            __pyx_Coroutine_methods,
-            __pyx_Coroutine_memberlist,
-            __pyx_Coroutine_getsets,
-            ''',
-
-            src, flags=re.X)
-
-        # Fix a segfault in Cython.
-        src = re.sub(
-            r'''
-            \s* __Pyx_Coroutine_get_qualname\(__pyx_CoroutineObject\s+\*self\)
-            \s* {
-            \s* Py_INCREF\(self->gi_qualname\);
-            ''',
-
-            r'''
-            __Pyx_Coroutine_get_qualname(__pyx_CoroutineObject *self)
-            {
-                if (self->gi_qualname == NULL) { return __pyx_empty_unicode; }
-                Py_INCREF(self->gi_qualname);
-            ''',
-
-            src, flags=re.X)
-
-        src = re.sub(
-            r'''
-            \s* __Pyx_Coroutine_get_name\(__pyx_CoroutineObject\s+\*self\)
-            \s* {
-            \s* Py_INCREF\(self->gi_name\);
-            ''',
-
-            r'''
-            __Pyx_Coroutine_get_name(__pyx_CoroutineObject *self)
-            {
-                if (self->gi_name == NULL) { return __pyx_empty_unicode; }
-                Py_INCREF(self->gi_name);
-            ''',
-
-            src, flags=re.X)
-
-        with open(cfile, 'wt') as f:
-            f.write(src)
-
     def build_libuv(self):
         env = _libuv_build_env()
 

tests/test_cython.py

@@ -11,7 +11,8 @@ def test_cython_coro_is_coroutine(self):
 
         coro = _test_coroutine_1()
 
-        self.assertEqual(_format_coroutine(coro), '_test_coroutine_1()')
+        self.assertTrue(
+            _format_coroutine(coro).startswith('_test_coroutine_1() done'))
         self.assertEqual(_test_coroutine_1.__qualname__, '_test_coroutine_1')
         self.assertEqual(_test_coroutine_1.__name__, '_test_coroutine_1')
         self.assertTrue(asyncio.iscoroutine(coro))
@@ -23,5 +24,9 @@ def test_cython_coro_is_coroutine(self):
         with self.assertRaises(asyncio.CancelledError):
             self.loop.run_until_complete(fut)
 
-        _format_coroutine(coro)  # This line checks against Cython segfault
+        try:
+            _format_coroutine(coro)  # This line checks against Cython segfault
+        except TypeError:
+            # TODO: Fix Cython to not reset __name__/__qualname__ to None
+            pass
         coro.close()

uvloop/loop.pyx

@@ -1375,6 +1375,7 @@ cdef class Loop:
 
         return self._getaddrinfo(host, port, family, type, proto, flags, 1)
 
+    @cython.iterable_coroutine
     async def getnameinfo(self, sockaddr, int flags=0):
         cdef:
             AddrInfo ai_cnt
@@ -1432,6 +1433,7 @@ cdef class Loop:
 
         return await self._getnameinfo(ai.ai_addr, flags)
 
+    @cython.iterable_coroutine
     async def create_server(self, protocol_factory, host=None, port=None,
                             *,
                             int family=uv.AF_UNSPEC,
@@ -1563,6 +1565,7 @@ cdef class Loop:
         server._ref()
         return server
 
+    @cython.iterable_coroutine
     async def create_connection(self, protocol_factory, host=None, port=None, *,
                                 ssl=None, family=0, proto=0, flags=0, sock=None,
                                 local_addr=None, server_hostname=None):
@@ -1771,6 +1774,7 @@ cdef class Loop:
         else:
             return tr, protocol
 
+    @cython.iterable_coroutine
     async def create_unix_server(self, protocol_factory, path=None,
                                  *, backlog=100, sock=None, ssl=None):
         """A coroutine which creates a UNIX Domain Socket server.
@@ -1882,6 +1886,7 @@ cdef class Loop:
         server._add_server(pipe)
         return server
 
+    @cython.iterable_coroutine
     async def create_unix_connection(self, protocol_factory, path=None, *,
                                      ssl=None, sock=None,
                                      server_hostname=None):
@@ -2148,6 +2153,7 @@ cdef class Loop:
         self._add_reader(sock, handle)
         return fut
 
+    @cython.iterable_coroutine
     async def sock_sendall(self, sock, data):
         """Send data to the socket.
 
@@ -2227,6 +2233,7 @@ cdef class Loop:
         self._add_reader(sock, handle)
         return fut
 
+    @cython.iterable_coroutine
     async def sock_connect(self, sock, address):
         """Connect to a remote socket at address.
 
@@ -2247,6 +2254,7 @@ cdef class Loop:
         finally:
             socket_dec_io_ref(sock)
 
+    @cython.iterable_coroutine
     async def connect_accepted_socket(self, protocol_factory, sock, *,
                                       ssl=None):
         """Handle an accepted connection.
@@ -2320,6 +2328,7 @@ cdef class Loop:
     def set_default_executor(self, executor):
         self._default_executor = executor
 
+    @cython.iterable_coroutine
     async def __subprocess_run(self, protocol_factory, args,
                                stdin=subprocess_PIPE,
                                stdout=subprocess_PIPE,
@@ -2406,6 +2415,7 @@ cdef class Loop:
         return self.__subprocess_run(protocol_factory, args, shell=False,
                                      **kwargs)
 
+    @cython.iterable_coroutine
     async def connect_read_pipe(self, proto_factory, pipe):
         """Register read pipe in event loop. Set the pipe to non-blocking mode.
 
@@ -2430,6 +2440,7 @@ cdef class Loop:
         transp._attach_fileobj(pipe)
         return transp, proto
 
+    @cython.iterable_coroutine
     async def connect_write_pipe(self, proto_factory, pipe):
         """Register write pipe in event loop.
 
@@ -2541,6 +2552,7 @@ cdef class Loop:
 
         return True
 
+    @cython.iterable_coroutine
     async def create_datagram_endpoint(self, protocol_factory,
                                        local_addr=None, remote_addr=None, *,
                                        family=0, proto=0, flags=0,
@@ -2701,6 +2713,7 @@ cdef class Loop:
 
         self._asyncgens.add(agen)
 
+    @cython.iterable_coroutine
     async def shutdown_asyncgens(self):
         """Shutdown all active asynchronous generators."""
         self._asyncgens_shutdown_called = True
@@ -2831,5 +2844,6 @@ def _sighandler_noop(signum, frame):
 
 ########### Stuff for tests:
 
+@cython.iterable_coroutine
 async def _test_coroutine_1():
     return 42

uvloop/server.pyx

@@ -39,6 +39,7 @@ cdef class Server:
     def __repr__(self):
         return '<%s sockets=%r>' % (self.__class__.__name__, self.sockets)
 
+    @cython.iterable_coroutine
     async def wait_closed(self):
         if self._servers is None or self._waiters is None:
             return