Explicitly declare execute and execute_cell in NotebookClient class

Author: davidbrochart

nbclient/client.py

@@ -294,6 +294,34 @@ def __init__(self, nb, km=None, **kw):
         self.km = km
         self.reset_execution_trackers()
 
+    def run_blocking(self, coro):
+        """Runs a coroutine and blocks until it has executed.
+
+        An event loop is created if no one already exists. If an event loop is
+        already running, this event loop execution is nested into the already
+        running one if `nest_asyncio` is set to True.
+
+        Parameters
+        ----------
+        coro : coroutine
+            The coroutine to be executed.
+
+        Returns
+        -------
+        result :
+            Whatever the coroutine returns.
+        """
+        try:
+            loop = asyncio.get_event_loop()
+        except RuntimeError:
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+        if self.nest_asyncio:
+            import nest_asyncio
+            nest_asyncio.apply(loop)
+        result = loop.run_until_complete(coro)
+        return result
+
     def reset_execution_trackers(self):
         """Resets any per-execution trackers.
         """
@@ -380,6 +408,9 @@ async def setup_kernel(self, **kwargs):
             self.kc.stop_channels()
             self.kc = None
 
+    def execute(self, **kwargs):
+        return self.run_blocking(self.async_execute(**kwargs))
+
     async def async_execute(self, **kwargs):
         """
         Executes each code cell.
@@ -551,6 +582,11 @@ def _check_raise_for_error(self, cell, exec_reply):
             if (exec_reply is not None) and exec_reply['content']['status'] == 'error':
                 raise CellExecutionError.from_cell_and_msg(cell, exec_reply['content'])
 
+    def execute_cell(self, cell, cell_index, execution_count=None, store_history=True):
+        return self.run_blocking(
+            self.async_execute_cell(cell, cell_index, execution_count, store_history)
+        )
+
     async def async_execute_cell(self, cell, cell_index, execution_count=None, store_history=True):
         """
         Executes a single code cell.
@@ -750,24 +786,6 @@ def _get_buffer_data(self, msg):
         return encoded_buffers
 
 
-def make_blocking(async_method):
-    def blocking_method(self, *args, **kwargs):
-        try:
-            loop = asyncio.get_event_loop()
-        except RuntimeError:
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-        if self.nest_asyncio:
-            import nest_asyncio
-            nest_asyncio.apply(loop)
-        return loop.run_until_complete(async_method(self, *args, **kwargs))
-    return blocking_method
-
-
-NotebookClient.execute = make_blocking(NotebookClient.async_execute)
-NotebookClient.execute_cell = make_blocking(NotebookClient.async_execute_cell)
-
-
 def execute(nb, cwd=None, km=None, **kwargs):
     """Execute a notebook's code, updating outputs within the notebook object.