Merge pull request #667 from minrk/stop_aborting_async

forward-port stop_aborting fix

Author: minrk

ipyparallel/engine/kernel.py

@@ -51,7 +51,7 @@ def __init__(self, **kwargs):
 
     def _abort_queues(self):
         # forward-port ipython/ipykernel#853
-        # may remove after requiring ipykernel 6.9
+        # may remove after requiring ipykernel 6.9.1
 
         # while this flag is true,
         # execute requests will be aborted
@@ -62,6 +62,11 @@ def _abort_queues(self):
         def stop_aborting():
             self.log.info("Finishing abort")
             self._aborting = False
+            # must be awaitable for ipykernel >= 3.6
+            # must also be sync for ipykernel < 3.6
+            f = asyncio.Future()
+            f.set_result(None)
+            return f
 
         # put stop_aborting on the message queue
         # so that it's handled after processing of already-pending messages