Fix issue #121 and #123

Author: ha7ilm

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:
@@ -248,14 +249,15 @@ 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=""))):
+            with pipes(stdout=_PseudoStream(partial(self.Print, sep="", end="")),
+                stderr=_PseudoStream(partial(self.Error, sep="", 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()
@@ -267,7 +269,7 @@ def _execute_sync(self, code):
         except (SyntaxError, MatlabExecutionError) as exc:
             stdout = exc.args[0]
             self.Error(stdout)
-            return ExceptionWrapper("Error", -1, stdout)
+            return ExceptionWrapper("Error", "-1", stdout)
         stdout = out.getvalue()
         self.Print(stdout)