Merge from 3.x. PR #4541

Author: ccordoba12

Diff for: spyder/app/mainwindow.py

@@ -143,7 +143,6 @@
 from spyder.config.utils import IMPORT_EXT, is_gtk_desktop
 from spyder.app.cli_options import get_options
 from spyder import dependencies
-from spyder.config.ipython import QTCONSOLE_INSTALLED
 from spyder.py3compat import (getcwd, is_text_string, to_text_string,
                               PY3, qbytearray_to_str, configparser as cp)
 from spyder.utils import encoding, programs
@@ -477,11 +476,6 @@ def signal_handler(signum, frame=None):
         # the window is in fullscreen mode:
         self.maximized_flag = None
 
-        # Track which console plugin type had last focus
-        # True: Console plugin
-        # False: IPython console plugin
-        self.last_console_plugin_focus_was_python = True
-
         # To keep track of the last focused widget
         self.last_focused_widget = None
         self.previous_focused_widget = None
@@ -882,11 +876,10 @@ def create_edit_action(text, tr_text, icon):
         self.variableexplorer.register_plugin()
 
         # IPython console
-        if QTCONSOLE_INSTALLED:
-            self.set_splash(_("Loading IPython console..."))
-            from spyder.plugins.ipythonconsole import IPythonConsole
-            self.ipyconsole = IPythonConsole(self)
-            self.ipyconsole.register_plugin()
+        self.set_splash(_("Loading IPython console..."))
+        from spyder.plugins.ipythonconsole import IPythonConsole
+        self.ipyconsole = IPythonConsole(self)
+        self.ipyconsole.register_plugin()
 
         # Third-party plugins
         self.set_splash(_("Loading third-party plugins..."))
@@ -986,7 +979,7 @@ def trigger(i=i, self=self):  # closure needed!
                                 programs.start_file(get_python_doc_path()))
             self.help_menu_actions.append(pydoc_act)
         # IPython documentation
-        if self.ipyconsole is not None and self.help is not None:
+        if self.help is not None:
             ipython_menu = QMenu(_("IPython documentation"), self)
             intro_action = create_action(self, _("Intro to IPython"),
                                         triggered=self.ipyconsole.show_intro)
@@ -1217,16 +1210,9 @@ def post_visible_setup(self):
             self.console.dockwidget.hide()
 
         # Show Help and Consoles by default
-        plugins_to_show = []
+        plugins_to_show = [self.ipyconsole]
         if self.help is not None:
             plugins_to_show.append(self.help)
-        if self.ipyconsole is not None:
-            if self.ipyconsole.isvisible:
-                plugins_to_show += [self.extconsole, self.ipyconsole]
-            else:
-                plugins_to_show += [self.ipyconsole, self.extconsole]
-        else:
-            plugins_to_show += [self.extconsole]
         for plugin in plugins_to_show:
             if plugin.dockwidget.isVisible():
                 plugin.dockwidget.raise_()
@@ -1236,8 +1222,7 @@ def post_visible_setup(self):
         self.extconsole.toggle_view_action.setChecked(False)
 
         # Show history file if no console is visible
-        ipy_visible = self.ipyconsole is not None and self.ipyconsole.isvisible
-        if not self.extconsole.isvisible and not ipy_visible:
+        if not self.ipyconsole.isvisible:
             self.historylog.add_history(get_conf_path('history.py'))
 
         if self.open_project:
@@ -1948,16 +1933,6 @@ def plugin_focus_changed(self):
         self.update_edit_menu()
         self.update_search_menu()
 
-        # Now deal with Python shell and IPython plugins
-        if self.ipyconsole is not None:
-            focus_client = self.ipyconsole.get_focus_client()
-            if focus_client is not None:
-                self.last_console_plugin_focus_was_python = False
-        else:
-            shell = get_focus_python_shell()
-            if shell is not None:
-                self.last_console_plugin_focus_was_python = True
-
     def show_shortcuts(self, menu):
         """Show action shortcuts in menu"""
         for element in getattr(self, menu + '_menu_actions'):
@@ -2446,11 +2421,7 @@ def execute_in_external_console(self, lines, focus_to_editor):
         Execute lines in external or IPython console and eventually set focus
         to the editor
         """
-        console = self.extconsole
-        if self.ipyconsole is None or self.last_console_plugin_focus_was_python:
-            console = self.extconsole
-        else:
-            console = self.ipyconsole
+        console = self.ipyconsole
         console.visibility_changed(True)
         console.raise_()
         console.execute_code(lines)

Diff for: spyder/config/ipython.py

@@ -29,6 +29,7 @@
                             QToolBar, QVBoxLayout, QWidget)
 
 # Local imports
+from spyder import dependencies
 from spyder.config.base import _, get_conf_path, PYTEST
 from spyder.config.main import (CONF, RUN_CELL_SHORTCUT,
                                 RUN_CELL_AND_ADVANCE_SHORTCUT)
@@ -52,6 +53,12 @@
                                       RunConfigDialog, RunConfigOneDialog)
 
 
+# Dependencies
+NBCONVERT_REQVER = ">=4.0"
+dependencies.add("nbconvert", _("Manipulate Jupyter notebooks on the Editor"),
+                 required_version=NBCONVERT_REQVER)
+
+
 def _load_all_breakpoints():
     bp_dict = CONF.get('run', 'breakpoints', {})
     for filename in list(bp_dict.keys()):
@@ -2338,17 +2345,11 @@ def clear_breakpoint(self, filename, lineno):
 
     def debug_command(self, command):
         """Debug actions"""
-        if self.main.ipyconsole is not None:
-            if self.main.last_console_plugin_focus_was_python:
-                self.main.extconsole.execute_code(command)
-            else:
-                self.main.ipyconsole.write_to_stdin(command)
-                focus_widget = self.main.ipyconsole.get_focus_widget()
-                if focus_widget:
-                    focus_widget.setFocus()
-        else:
-            self.main.extconsole.execute_code(command)
-    
+        self.main.ipyconsole.write_to_stdin(command)
+        focus_widget = self.main.ipyconsole.get_focus_widget()
+        if focus_widget:
+            focus_widget.setFocus()
+
     #------ Run Python script
     @Slot()
     def edit_run_configurations(self):
@@ -2443,17 +2444,9 @@ def re_run_file(self):
          python, python_args, current, systerm,
          post_mortem, clear_namespace) = self.__last_ec_exec
         if current:
-            if self.main.ipyconsole is not None:
-                if self.main.last_console_plugin_focus_was_python:
-                    self.run_in_current_extconsole.emit(fname, wdir, args,
-                                                        debug, post_mortem)
-                else:
-                    self.run_in_current_ipyclient.emit(fname, wdir, args,
-                                                       debug, post_mortem,
-                                                       clear_namespace)
-            else:
-                self.run_in_current_extconsole.emit(fname, wdir, args, debug,
-                                                    post_mortem)
+            self.run_in_current_ipyclient.emit(fname, wdir, args,
+                                               debug, post_mortem,
+                                               clear_namespace)
         else:
             self.main.open_external_console(fname, wdir, args, interact,
                                             debug, python, python_args,

Diff for: spyder/plugins/editor.py

@@ -23,7 +23,6 @@
 from spyder import dependencies
 from spyder.config.base import _, get_conf_path, get_module_source_path
 from spyder.config.fonts import DEFAULT_SMALL_DELTA
-from spyder.config.ipython import QTCONSOLE_INSTALLED
 from spyder.api.plugins import SpyderPluginWidget
 from spyder.api.preferences import PluginConfigPage
 from spyder.py3compat import get_meth_class_inst, to_text_string
@@ -124,7 +123,6 @@ def setup_page(self):
             editor_box.setToolTip(editor_tip)
         ipython_box = self.create_checkbox(_("IPython Console"),
                                            'connect/ipython_console')
-        ipython_box.setEnabled(QTCONSOLE_INSTALLED)
 
         connections_layout = QVBoxLayout()
         connections_layout.addWidget(connections_label)
@@ -540,8 +538,7 @@ def apply_plugin_settings(self, options):
 
         # To make auto-connection changes take place instantly
         self.main.editor.apply_plugin_settings(options=[connect_n])
-        if self.main.ipyconsole is not None:
-            self.main.ipyconsole.apply_plugin_settings(options=[connect_n])
+        self.main.ipyconsole.apply_plugin_settings(options=[connect_n])
 
     #------ Public API (related to Help's source) -------------------------
     def source_is_console(self):
@@ -889,10 +886,9 @@ def get_shell(self):
         """
         if not hasattr(self.shell, 'get_doc') or not self.shell.is_running():
             self.shell = None
-            if self.main.ipyconsole is not None:
-                shell = self.main.ipyconsole.get_current_shellwidget()
-                if shell is not None and shell.kernel_client is not None:
-                    self.shell = shell
+            shell = self.main.ipyconsole.get_current_shellwidget()
+            if shell is not None and shell.kernel_client is not None:
+                self.shell = shell
             if self.shell is None:
                 self.shell = self.internal_shell
         return self.shell

Diff for: spyder/plugins/help.py

@@ -60,15 +60,19 @@
 from spyder.widgets.tabs import Tabs
 
 
+# Dependencies
 SYMPY_REQVER = '>=0.7.3'
 dependencies.add("sympy", _("Symbolic mathematics in the IPython Console"),
                  required_version=SYMPY_REQVER, optional=True)
 
-
 CYTHON_REQVER = '>=0.21'
 dependencies.add("cython", _("Run Cython files in the IPython Console"),
                  required_version=CYTHON_REQVER, optional=True)
 
+QTCONSOLE_REQVER = ">=4.2.0"
+dependencies.add("qtconsole", _("Integrate the IPython console"),
+                 required_version=QTCONSOLE_REQVER)
+
 
 #------------------------------------------------------------------------------
 # Existing kernels
@@ -740,8 +744,6 @@ def refresh_plugin(self):
             sw = client.shellwidget
             self.variableexplorer.set_shellwidget_from_id(id(sw))
             self.help.set_shell(sw)
-        if not self.testing:
-            self.main.last_console_plugin_focus_was_python = False
         self.sig_update_plugin_title.emit()
 
     def get_plugin_actions(self):

Diff for: spyder/plugins/ipythonconsole.py

@@ -386,8 +386,7 @@ def show_explorer(self):
 
     def restart_consoles(self):
         """Restart consoles when closing, opening and switching projects"""
-        if self.main.ipyconsole:
-            self.main.ipyconsole.restart()
+        self.main.ipyconsole.restart()
 
     def is_valid_project(self, path):
         """Check if a directory is a valid Spyder project"""