Rollback all changes to tasks.py; drop forever

python · 1st1 · Nov 10, 2016 · Nov 15, 2016 · Nov 15, 2016 · Nov 15, 2016
commit fa721ee80e17bcbdde8f5f5431538300436b2301
diff --git a/asyncio/__init__.py b/asyncio/__init__.py
@@ -42,7 +42,7 @@
            subprocess.__all__ +
            tasks.__all__ +
            transports.__all__ +
-           ['run', 'forever'])  # Will fix this later.
+           ['run'])  # Will fix this later.
 
 if sys.platform == 'win32':  # pragma: no cover
     from .windows_events import *

diff --git a/asyncio/run.py b/asyncio/run.py
@@ -1,6 +1,6 @@
 """asyncio.run() function."""
 
-__all__ = ['run', 'forever']
+__all__ = ['run']
 
 import inspect
 import threading
@@ -15,33 +15,6 @@ def _isasyncgen(obj):
     return False
 
 
-@coroutines.coroutine
-def forever():
-    """Wait until the current event loop stops running.
-
-    The coroutine will return None if the loop is stopped by
-    calling the `loop.stop()` method.
-
-    The coroutine will propagate any exception that caused
-    the loop to stop;
-
-    It is recommended to use this coroutine with the asyncio.run()
-    function:
-
-        async def coro():
-            print('hi')
-            try:
-                await asyncio.forever()
-            except KeyboardInterrupt:
-                await asyncio.sleep(1)
-                print('bye')
-
-        asyncio.run(coro())
-    """
-    loop = events.get_event_loop()
-    return (yield from loop.get_forever_future())
-
-
 def run(coro, *, debug=False):
     """Run a coroutine.
 

diff --git a/asyncio/tasks.py b/asyncio/tasks.py
@@ -302,7 +302,7 @@ def _step(self, exc=None):
     def _wakeup(self, future):
         try:
             future.result()
-        except BaseException as exc:
+        except Exception as exc:
             # This may also be a cancellation.
             self._step(exc)
         else: