bpo-36921: Deprecate @coroutine and yield from in asyncio

Lib/asyncio/coroutines.py

@@ -7,6 +7,7 @@
 import sys
 import traceback
 import types
+import warnings
 
 from . import base_futures
 from . import constants
@@ -52,6 +53,9 @@ def __repr__(self):
         return f'<{self.__class__.__name__} {coro_repr}>'
 
     def __iter__(self):
+        warnings.warn("yield from coro is deprecated, please use await coro instead",
+                      DeprecationWarning,
+                      stacklevel=2)
         return self
 
     def __next__(self):
@@ -107,6 +111,10 @@ def coroutine(func):
     If the coroutine is not yielded from before it is destroyed,
     an error message is logged.
     """
+    warnings.warn("@coroutine decorator is deprecated, "
+                  "please use async def function instead",
+                  DeprecationWarning,
+                  stacklevel=2)
     if inspect.iscoroutinefunction(func):
         # In Python 3.5 that's all we need to do for coroutines
         # defined with "async def".

Lib/asyncio/futures.py

@@ -8,6 +8,7 @@
 import contextvars
 import logging
 import sys
+import warnings
 
 from . import base_futures
 from . import events
@@ -259,7 +260,11 @@ def __await__(self):
             raise RuntimeError("await wasn't used with future")
         return self.result()  # May raise too.
 
-    __iter__ = __await__  # make compatible with 'yield from'.
+    def __iter__(self):
+        warnings.warn("yield from fut is deprecated, please use await fut instead",
+                      DeprecationWarning,
+                      stacklevel=2)
+        return self.__await__()
 
 
 # Needed for testing purposes.

Lib/asyncio/locks.py

@@ -3,12 +3,13 @@
 __all__ = ('Lock', 'Event', 'Condition', 'Semaphore', 'BoundedSemaphore')
 
 import collections
+import types
 import warnings
 
 from . import events
 from . import futures
 from . import exceptions
-from .coroutines import coroutine
+from .coroutines import _is_coroutine
 
 
 class _ContextManager:
@@ -55,7 +56,7 @@ def __exit__(self, *args):
         # always raises; that's how the with-statement works.
         pass
 
-    @coroutine
+    @types.coroutine
     def __iter__(self):
         # This is not a coroutine.  It is meant to enable the idiom:
         #
@@ -77,6 +78,7 @@ def __iter__(self):
                       DeprecationWarning, stacklevel=2)
         yield from self.acquire()
         return _ContextManager(self)
+    __iter__._is_coroutine = _is_coroutine
 
     async def __acquire_ctx(self):
         await self.acquire()

Lib/asyncio/tasks.py

@@ -638,7 +638,7 @@ def ensure_future(coro_or_future, *, loop=None):
                         'required')
 
 
-@coroutine
+@types.coroutine
 def _wrap_awaitable(awaitable):
     """Helper for asyncio.ensure_future().
 
@@ -648,6 +648,9 @@ def _wrap_awaitable(awaitable):
     return (yield from awaitable.__await__())
 
 
+_wrap_awaitable._is_coroutine = coroutines._is_coroutine
+
+
 class _GatheringFuture(futures.Future):
     """Helper for gather().
 

Lib/test/test_asyncio/test_base_events.py

@@ -575,9 +575,8 @@ def zero_error(fut):
     def test_default_exc_handler_coro(self):
         self.loop._process_events = mock.Mock()
 
-        @asyncio.coroutine
-        def zero_error_coro():
-            yield from asyncio.sleep(0.01)
+        async def zero_error_coro():
+            await asyncio.sleep(0.01)
             1/0
 
         # Test Future.__del__
@@ -723,8 +722,7 @@ def test_set_task_factory(self):
         class MyTask(asyncio.Task):
             pass
 
-        @asyncio.coroutine
-        def coro():
+        async def coro():
             pass
 
         factory = lambda loop, coro: MyTask(coro, loop=loop)
@@ -779,8 +777,7 @@ def test_create_task(self):
         class MyTask(asyncio.Task):
             pass
 
-        @asyncio.coroutine
-        def test():
+        async def test():
             pass
 
         class EventLoop(base_events.BaseEventLoop):
@@ -830,8 +827,7 @@ def test_run_forever_keyboard_interrupt(self):
         # Python issue #22601: ensure that the temporary task created by
         # run_forever() consumes the KeyboardInterrupt and so don't log
         # a warning
-        @asyncio.coroutine
-        def raise_keyboard_interrupt():
+        async def raise_keyboard_interrupt():
             raise KeyboardInterrupt
 
         self.loop._process_events = mock.Mock()
@@ -849,8 +845,7 @@ def raise_keyboard_interrupt():
     def test_run_until_complete_baseexception(self):
         # Python issue #22429: run_until_complete() must not schedule a pending
         # call to stop() if the future raised a BaseException
-        @asyncio.coroutine
-        def raise_keyboard_interrupt():
+        async def raise_keyboard_interrupt():
             raise KeyboardInterrupt
 
         self.loop._process_events = mock.Mock()
@@ -1070,9 +1065,7 @@ def test_create_connection_multiple_errors(self, m_socket):
         class MyProto(asyncio.Protocol):
             pass
 
-        @asyncio.coroutine
-        def getaddrinfo(*args, **kw):
-            yield from []
+        async def getaddrinfo(*args, **kw):
             return [(2, 1, 6, '', ('107.6.106.82', 80)),
                     (2, 1, 6, '', ('107.6.106.82', 80))]
 
@@ -1191,9 +1184,8 @@ def test_create_connection_no_host_port_sock(self):
         self.assertRaises(ValueError, self.loop.run_until_complete, coro)
 
     def test_create_connection_no_getaddrinfo(self):
-        @asyncio.coroutine
-        def getaddrinfo(*args, **kw):
-            yield from []
+        async def getaddrinfo(*args, **kw):
+            pass
 
         def getaddrinfo_task(*args, **kwds):
             return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
@@ -1219,8 +1211,7 @@ def getaddrinfo_task(*args, **kwds):
             OSError, self.loop.run_until_complete, coro)
 
     def test_create_connection_multiple(self):
-        @asyncio.coroutine
-        def getaddrinfo(*args, **kw):
+        async def getaddrinfo(*args, **kw):
             return [(2, 1, 6, '', ('0.0.0.1', 80)),
                     (2, 1, 6, '', ('0.0.0.2', 80))]
 
@@ -1247,8 +1238,7 @@ def bind(addr):
 
         m_socket.socket.return_value.bind = bind
 
-        @asyncio.coroutine
-        def getaddrinfo(*args, **kw):
+        async def getaddrinfo(*args, **kw):
             return [(2, 1, 6, '', ('0.0.0.1', 80)),
                     (2, 1, 6, '', ('0.0.0.2', 80))]
 
@@ -1349,8 +1339,7 @@ def test_create_connection_service_name(self, m_socket):
                 self.loop.run_until_complete(coro)
 
     def test_create_connection_no_local_addr(self):
-        @asyncio.coroutine
-        def getaddrinfo(host, *args, **kw):
+        async def getaddrinfo(host, *args, **kw):
             if host == 'example.com':
                 return [(2, 1, 6, '', ('107.6.106.82', 80)),
                         (2, 1, 6, '', ('107.6.106.82', 80))]
@@ -1488,11 +1477,9 @@ def test_create_server_empty_host(self):
         # if host is empty string use None instead
         host = object()
 
-        @asyncio.coroutine
-        def getaddrinfo(*args, **kw):
+        async def getaddrinfo(*args, **kw):
             nonlocal host
             host = args[0]
-            yield from []
 
         def getaddrinfo_task(*args, **kwds):
             return asyncio.Task(getaddrinfo(*args, **kwds), loop=self.loop)
@@ -1854,8 +1841,7 @@ def test_accept_connection_exception(self, m_log):
             MyProto, sock, None, None, mock.ANY, mock.ANY)
 
     def test_call_coroutine(self):
-        @asyncio.coroutine
-        def simple_coroutine():
+        async def simple_coroutine():
             pass
 
         self.loop.set_debug(True)
@@ -1880,9 +1866,7 @@ def test_log_slow_callbacks(self, m_logger):
         def stop_loop_cb(loop):
             loop.stop()
 
-        @asyncio.coroutine
-        def stop_loop_coro(loop):
-            yield from ()
+        async def stop_loop_coro(loop):
             loop.stop()
 
         asyncio.set_event_loop(self.loop)
@@ -1909,8 +1893,7 @@ def stop_loop_coro(loop):
 class RunningLoopTests(unittest.TestCase):
 
     def test_running_loop_within_a_loop(self):
-        @asyncio.coroutine
-        def runner(loop):
+        async def runner(loop):
             loop.run_forever()
 
         loop = asyncio.new_event_loop()

Lib/test/test_asyncio/test_events.py

@@ -253,12 +253,10 @@ def tearDown(self):
         super().tearDown()
 
     def test_run_until_complete_nesting(self):
-        @asyncio.coroutine
-        def coro1():
-            yield
+        async def coro1():
+            await asyncio.sleep(0)
 
-        @asyncio.coroutine
-        def coro2():
+        async def coro2():
             self.assertTrue(self.loop.is_running())
             self.loop.run_until_complete(coro1())
 
@@ -735,8 +733,7 @@ def test_connect_accepted_socket_ssl_timeout_for_plain_socket(self):
 
     @mock.patch('asyncio.base_events.socket')
     def create_server_multiple_hosts(self, family, hosts, mock_sock):
-        @asyncio.coroutine
-        def getaddrinfo(host, port, *args, **kw):
+        async def getaddrinfo(host, port, *args, **kw):
             if family == socket.AF_INET:
                 return [(family, socket.SOCK_STREAM, 6, '', (host, port))]
             else:
@@ -1662,8 +1659,7 @@ def test_add_fds_after_closing(self):
             loop.add_writer(w, callback)
 
     def test_close_running_event_loop(self):
-        @asyncio.coroutine
-        def close_loop(loop):
+        async def close_loop(loop):
             self.loop.close()
 
         coro = close_loop(self.loop)
@@ -1673,8 +1669,7 @@ def close_loop(loop):
     def test_close(self):
         self.loop.close()
 
-        @asyncio.coroutine
-        def test():
+        async def test():
             pass
 
         func = lambda: False

Lib/test/test_asyncio/test_futures.py

@@ -253,9 +253,11 @@ def test_yield_from_twice(self):
 
         def fixture():
             yield 'A'
-            x = yield from f
+            with self.assertWarns(DeprecationWarning):
+                x = yield from f
             yield 'B', x
-            y = yield from f
+            with self.assertWarns(DeprecationWarning):
+                y = yield from f
             yield 'C', y
 
         g = fixture()
@@ -533,7 +535,8 @@ def test_set_result_unless_cancelled(self):
     def test_future_stop_iteration_args(self):
         fut = self._new_future(loop=self.loop)
         fut.set_result((1, 2))
-        fi = fut.__iter__()
+        with self.assertWarns(DeprecationWarning):
+            fi = fut.__iter__()
         result = None
         try:
             fi.send(None)
@@ -545,7 +548,8 @@ def test_future_stop_iteration_args(self):
 
     def test_future_iter_throw(self):
         fut = self._new_future(loop=self.loop)
-        fi = iter(fut)
+        with self.assertWarns(DeprecationWarning):
+            fi = iter(fut)
         self.assertRaises(TypeError, fi.throw,
                           Exception, Exception("elephant"), 32)
         self.assertRaises(TypeError, fi.throw,