compatibility fix for async in IPython 7.0

Author: Chilipp

psyplot_gui/__init__.py

@@ -215,7 +215,7 @@ def start_app(fnames=[], name=[], dims=None, plot_method=None,
     if script is not None:
         mainwindow.console.run_script_in_shell(script)
     if command is not None:
-        mainwindow.console.kernel_manager.kernel.shell.run_code(command)
+        mainwindow.console.run_command_in_shell(command)
     if exec_:
         sys.excepthook = mainwindow.excepthook
         sys.exit(app.exec_())

psyplot_gui/console.py

@@ -133,7 +133,7 @@ def __init__(self, main, *args, **kwargs):
         self.kernel_manager = kernel_manager
         self.kernel_client = kernel_client
 
-        self.kernel_manager.kernel.shell.run_code(
+        self.run_command_in_shell(
             '\n'.join('import %s as %s' % t for t in modules2import))
         self.exit_requested.connect(self._close_mainwindow)
         self.exit_requested.connect(QtCore.QCoreApplication.instance().quit)
@@ -166,13 +166,13 @@ def update_mp(self, project):
         """Update the `mp` variable in the shell is
         ``rcParams['console.auto_set_mp']`` with a main project"""
         if self.rc['auto_set_mp'] and project is not None and project.is_main:
-            self.kernel_manager.kernel.shell.run_code('mp = psy.gcp(True)')
+            self.run_command_in_shell('mp = psy.gcp(True)')
 
     def update_sp(self, project):
         """Update the `sp` variable in the shell is
         ``rcParams['console.auto_set_sp']`` with a sub project"""
         if self.rc['auto_set_sp'] and (project is None or not project.is_main):
-            self.kernel_manager.kernel.shell.run_code('sp = psy.gcp()')
+            self.run_command_in_shell('sp = psy.gcp()')
 
     def show_current_help(self, to_end=False, force=False):
         """Show the help of the object at the cursor position if
@@ -271,9 +271,18 @@ def _run_command_in_shell(self, args):
         # 2: command
         self.run_command_in_shell(args[2])
 
-    def run_command_in_shell(self, command):
+    def run_command_in_shell(self, code, *args, **kwargs):
         """Run a script in the shell"""
-        self.kernel_manager.kernel.shell.run_code(command)
+        ret = self.kernel_manager.kernel.shell.run_code(code, *args, **kwargs)
+        import IPython
+        if IPython.__version__ < '7.0':  # run_code is an asyncio.coroutine
+            return ret
+        else:
+            import asyncio
+            gathered = asyncio.gather(ret)
+            loop = asyncio.get_event_loop()
+            ret = loop.run_until_complete(gathered)
+            return ret[0]
 
     def _close_mainwindow(self):
         from psyplot_gui.main import mainwindow

psyplot_gui/fmt_widget.py

@@ -551,7 +551,7 @@ def run_code(self):
                 e = ExecutionResult(info)
             else:
                 e = ExecutionResult()
-            self.shell.run_code(code, e)
+            self.console.run_command_in_shell(code, e)
             try:
                 e.raise_error()
             except Exception:  # reset the console and clear the error message

tests/test_console.py

@@ -91,7 +91,7 @@ def test_current_object(self):
         self.assertEqual(c.get_current_object(), 'object')
 
     def test_command(self):
-        self.window.console.kernel_manager.kernel.shell.run_code('a = 4')
+        self.window.console.run_command_in_shell('a = 4')
         self.assertEqual(self.window.console.get_obj('a')[1], 4)
 
     def test_mp_sp(self):