Skip to content

Commit

Permalink
Don't stop the loop in run_until_complete() on SystemExit and `Ke…
Browse files Browse the repository at this point in the history
…yboardInterrupt` exceptions (#337)

* Don't stop the loop in run_until_complete on SystemExit & KeyboardInterrupt
* Add unit test (based on CPython's equivalent)
* Fix the test to resume its coverage.

Co-authored-by: Victor Stinner <victor.stinner@gmail.com>
Co-authored-by: Fantix King <fantix.king@gmail.com>
  • Loading branch information
3 people committed Feb 8, 2021
1 parent b7048b9 commit 8c471f8
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
20 changes: 20 additions & 0 deletions tests/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,26 @@ def throw():
# done-callback for the previous future.
self.loop.run_until_complete(foo(0.2))

def test_run_until_complete_keyboard_interrupt(self):
# Issue #336: run_until_complete() must not schedule a pending
# call to stop() if the future raised a KeyboardInterrupt
async def raise_keyboard_interrupt():
raise KeyboardInterrupt

self.loop._process_events = mock.Mock()

with self.assertRaises(KeyboardInterrupt):
self.loop.run_until_complete(raise_keyboard_interrupt())

def func():
self.loop.stop()
func.called = True

func.called = False
self.loop.call_later(0.01, func)
self.loop.run_forever()
self.assertTrue(func.called)

def test_debug_slow_callbacks(self):
logger = logging.getLogger('asyncio')
self.loop.set_debug(True)
Expand Down
9 changes: 8 additions & 1 deletion uvloop/loop.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,14 @@ cdef class Loop:
# is no need to log the "destroy pending task" message
future._log_destroy_pending = False

done_cb = lambda fut: self.stop()
def done_cb(fut):
if not fut.cancelled():
exc = fut.exception()
if isinstance(exc, (SystemExit, KeyboardInterrupt)):
# Issue #336: run_forever() already finished,
# no need to stop it.
return
self.stop()

future.add_done_callback(done_cb)
try:
Expand Down

0 comments on commit 8c471f8

Please sign in to comment.