make nbconvert 5.5 compatible

voila/execute.py

@@ -20,6 +20,11 @@
 
 from ipykernel.jsonutil import json_clean
 
+try:
+    TimeoutError  # Py 3
+except NameError:
+    TimeoutError = RuntimeError  # Py 2
+
 
 def strip_code_cell_errors(cell):
     """Strip any error outputs and traceback from a code cell."""
@@ -231,6 +236,28 @@ def clear_output(self, outs, msg, cell_index):
             return
         super(VoilaExecutePreprocessor, self).clear_output(outs, msg, cell_index)
 
+    # make it nbconvert 5.5 compatible
+    def _get_timeout(self, cell):
+        if self.timeout_func is not None and cell is not None:
+            timeout = self.timeout_func(cell)
+        else:
+            timeout = self.timeout
+
+        if not timeout or timeout < 0:
+            timeout = None
+
+        return timeout
+
+    # make it nbconvert 5.5 compatible
+    def _handle_timeout(self, timeout):
+        self.log.error(
+            "Timeout waiting for execute reply (%is)." % timeout)
+        if self.interrupt_on_timeout:
+            self.log.error("Interrupting kernel")
+            self.km.interrupt_kernel()
+        else:
+            raise TimeoutError("Cell execution timed out")
+
     def run_cell(self, cell, cell_index=0, store_history=False):
         parent_msg_id = self.kc.execute(cell.source, store_history=store_history, stop_on_error=not self.allow_errors)
         self.log.debug("Executing cell:\n%s", cell.source)
@@ -260,7 +287,7 @@ def run_cell(self, cell, cell_index=0, store_history=False):
                 if not rlist and not wlist and not xlist:
                     self._check_alive()
                     if monotonic() > deadline:
-                        self._handle_timeout(exec_timeout, cell)
+                        self._handle_timeout(exec_timeout)
                 if xlist:
                     raise RuntimeError("Oops, unexpected rror")
                 if self.kc.shell_channel.socket in rlist:
@@ -277,7 +304,7 @@ def run_cell(self, cell, cell_index=0, store_history=False):
                     else:
                         self.log.debug("Received message for which we were not the parent: %s", msg)
             else:
-                self._handle_timeout(exec_timeout, cell)
+                self._handle_timeout(exec_timeout)
                 break
 
         return execute_reply, cell.outputs