Merge pull request #632 from SylvainCorlay/use-native-coroutines

Use native coroutines instead of tornado coroutines

Author: minrk

ipykernel/inprocess/client.py

@@ -11,6 +11,8 @@
 # Imports
 #-----------------------------------------------------------------------------
 
+import asyncio
+
 # IPython imports
 from traitlets import Type, Instance, default
 from jupyter_client.clientabc import KernelClientABC
@@ -173,8 +175,8 @@ def _dispatch_to_kernel(self, msg):
         stream = kernel.shell_stream
         self.session.send(stream, msg)
         msg_parts = stream.recv_multipart()
-        kernel.dispatch_shell(msg_parts)
-
+        loop = asyncio.get_event_loop()
+        loop.run_until_complete(kernel.dispatch_shell(msg_parts))
         idents, reply_msg = self.session.recv(stream, copy=False)
         self.shell_channel.call_handlers_later(reply_msg)
 

ipykernel/inprocess/ipkernel.py

@@ -74,16 +74,16 @@ def __init__(self, **traits):
         self._underlying_iopub_socket.observe(self._io_dispatch, names=['message_sent'])
         self.shell.kernel = self
 
-    def execute_request(self, stream, ident, parent):
+    async def execute_request(self, stream, ident, parent):
         """ Override for temporary IO redirection. """
         with self._redirected_io():
-            super(InProcessKernel, self).execute_request(stream, ident, parent)
+            await super(InProcessKernel, self).execute_request(stream, ident, parent)
 
     def start(self):
         """ Override registration of dispatchers for streams. """
         self.shell.exit_now = False
 
-    def _abort_queues(self):
+    async def _abort_queues(self):
         """ The in-process kernel doesn't abort requests. """
         pass
 

ipykernel/ipkernel.py

@@ -10,7 +10,6 @@
 
 from IPython.core import release
 from IPython.utils.tokenutil import token_at_cursor, line_at_cursor
-from tornado import gen
 from traitlets import Instance, Type, Any, List, Bool, observe, observe_compat
 from zmq.eventloop.zmqstream import ZMQStream
 
@@ -149,8 +148,7 @@ def __init__(self, **kwargs):
         'file_extension': '.py'
     }
 
-    @gen.coroutine
-    def dispatch_debugpy(self, msg):
+    async def dispatch_debugpy(self, msg):
         # The first frame is the socket id, we can drop it
         frame = msg[1].bytes.decode('utf-8')
         self.log.debug("Debugpy received: %s", frame)
@@ -279,9 +277,8 @@ def set_sigint_result():
             # restore the previous sigint handler
             signal.signal(signal.SIGINT, save_sigint)
 
-    @gen.coroutine
-    def do_execute(self, code, silent, store_history=True,
-                   user_expressions=None, allow_stdin=False):
+    async def do_execute(self, code, silent, store_history=True,
+                         user_expressions=None, allow_stdin=False):
         shell = self.shell # we'll need this a lot here
 
         self._forward_input(allow_stdin)
@@ -294,8 +291,7 @@ def do_execute(self, code, silent, store_history=True,
             should_run_async = lambda cell: False
             # older IPython,
             # use blocking run_cell and wrap it in coroutine
-            @gen.coroutine
-            def run_cell(*args, **kwargs):
+            async def run_cell(*args, **kwargs):
                 return shell.run_cell(*args, **kwargs)
         try:
 
@@ -327,7 +323,7 @@ def run_cell(*args, **kwargs):
                 with self._cancel_on_sigint(coro_future):
                     res = None
                     try:
-                        res = yield coro_future
+                        res = await coro_future
                     finally:
                         shell.events.trigger('post_execute')
                         if not silent:
@@ -407,9 +403,8 @@ def do_complete(self, code, cursor_pos):
                 'metadata' : {},
                 'status' : 'ok'}
 
-    @gen.coroutine
-    def do_debug_request(self, msg):
-        return (yield self.debugger.process_request(msg))
+    async def do_debug_request(self, msg):
+        return await self.debugger.process_request(msg)
 
     def _experimental_do_complete(self, code, cursor_pos):
         """
@@ -445,8 +440,6 @@ def _experimental_do_complete(self, code, cursor_pos):
                 'metadata': {_EXPERIMENTAL_KEY_NAME: comps},
                 'status': 'ok'}
 
-
-
     def do_inspect(self, code, cursor_pos, detail_level=0):
         name = token_at_cursor(code, cursor_pos)