Merge pull request #124 from ha7ilm/master

blink1073 · web-flow · commit e911c25d3459 · 2019-06-10T17:45:42.000-05:00
Fix issue #121 and #123
diff --git a/matlab_kernel/kernel.py b/matlab_kernel/kernel.py
@@ -90,6 +90,7 @@ def _matlab(self):
         self._validated_plot_settings["size"] = tuple(
             self._matlab.get(0., "defaultfigureposition")[0][2:])
         self.handle_plot_settings()
+        return self.__matlab
 
     def do_execute_direct(self, code):
         if pipes:
@@ -249,13 +250,14 @@ def do_shutdown(self, restart):
     def _execute_async(self, code):
         try:
             with pipes(stdout=_PseudoStream(partial(self.Print, end="")),
-                       stderr=_PseudoStream(partial(self.Error, end=""))):
+                stderr=_PseudoStream(partial(self.Error, end=""))):
                 kwargs = { 'nargout': 0, 'async': True }
                 future = self._matlab.eval(code, **kwargs)
                 future.result()
         except (SyntaxError, MatlabExecutionError, KeyboardInterrupt) as exc:
-            stdout = exc.args[0]
-            return ExceptionWrapper("Error", -1, stdout)
+            pass
+            #stdout = exc.args[0]
+            #return ExceptionWrapper("Error", -1, stdout)
 
     def _execute_sync(self, code):
         out = StringIO()
