Merge pull request #4533 from ccordoba12/pyconsole-2

PR: Remove connection between Help and the Python Console

Author: ccordoba12

Diff for: spyder/config/main.py

@@ -254,7 +254,6 @@
               'max_history_entries': 20,
               'wrap': True,
               'connect/editor': False,
-              'connect/python_console': False,
               'connect/ipython_console': False,
               'math': True,
               'automatic_import': True,
@@ -656,7 +655,7 @@
 #    or if you want to *rename* options, then you need to do a MAJOR update in
 #    version, e.g. from 3.0.0 to 4.0.0
 # 3. You don't need to touch this value if you're just adding a new option
-CONF_VERSION = '36.0.0'
+CONF_VERSION = '37.0.0'
 
 # Main configuration instance
 try:

Diff for: spyder/plugins/externalconsole.py

@@ -279,7 +279,6 @@ def __init__(self, parent):
         self.tabwidget = None
         self.menu_actions = None
 
-        self.help = None # Help plugin
         self.historylog = None # History log plugin
 
         self.python_count = 0
@@ -618,10 +617,6 @@ def start(self, fname, wdir=None, args='', interact=False, debug=False,
                             self.get_option('codecompletion/case_sensitive') )
         shellwidget.shell.set_codecompletion_enter(
                             self.get_option('codecompletion/enter_key') )
-        if python and self.help is not None:
-            shellwidget.shell.set_help(self.help)
-            shellwidget.shell.set_help_enabled(
-                               CONF.get('help', 'connect/python_console'))
         if self.historylog is not None:
             self.historylog.add_history(shellwidget.shell.history_filename)
             shellwidget.shell.append_to_history.connect(
@@ -702,8 +697,6 @@ def process_started(self, shell_id):
         shell = self.shellwidgets[index]
         icon, _icon = self.icons[index]
         self.tabwidget.setTabIcon(index, icon)
-        if self.help is not None:
-            self.help.set_shell(shell.shell)
 
     def process_finished(self, shell_id):
         index = self.get_shell_index_from_id(shell_id)
@@ -759,7 +752,6 @@ def get_plugin_actions(self):
     def register_plugin(self):
         """Register plugin in Spyder's main window"""
         self.main.add_dockwidget(self)
-        self.help = self.main.help
         self.historylog = self.main.historylog
         self.edit_goto.connect(self.main.editor.load)
         self.edit_goto[str, int, str, bool].connect(
@@ -821,7 +813,6 @@ def refresh_plugin(self):
         self.tabwidget.set_corner_widgets({Qt.TopRightCorner: widgets})
         if shellwidget:
             shellwidget.update_time_label_visibility()
-            self.help.set_shell(shellwidget.shell)
         self.main.last_console_plugin_focus_was_python = True
         self.update_plugin_title.emit()
 
@@ -842,8 +833,6 @@ def apply_plugin_settings(self, options):
         icontext_o = self.get_option(icontext_n)
         calltips_n = 'calltips'
         calltips_o = self.get_option(calltips_n)
-        help_n = 'connect_to_oi'
-        help_o = CONF.get('help', 'connect/python_console')
         wrap_n = 'wrap'
         wrap_o = self.get_option(wrap_n)
         compauto_n = 'codecompletion/auto'
@@ -861,9 +850,6 @@ def apply_plugin_settings(self, options):
                 shellwidget.set_icontext_visible(icontext_o)
             if calltips_n in options:
                 shellwidget.shell.set_calltips(calltips_o)
-            if help_n in options:
-                if isinstance(shellwidget, ExternalPythonShell):
-                    shellwidget.shell.set_help_enabled(help_o)
             if wrap_n in options:
                 shellwidget.shell.toggle_wrap_mode(wrap_o)
             if compauto_n in options:

Diff for: spyder/plugins/help.py

@@ -123,16 +123,13 @@ def setup_page(self):
             editor_tip = _("This feature requires the Rope or Jedi libraries.\n"
                            "It seems you don't have either installed.")
             editor_box.setToolTip(editor_tip)
-        python_box = self.create_checkbox(_("Python Console"),
-                                          'connect/python_console')
         ipython_box = self.create_checkbox(_("IPython Console"),
                                            'connect/ipython_console')
         ipython_box.setEnabled(QTCONSOLE_INSTALLED)
 
         connections_layout = QVBoxLayout()
         connections_layout.addWidget(connections_label)
         connections_layout.addWidget(editor_box)
-        connections_layout.addWidget(python_box)
         connections_layout.addWidget(ipython_box)
         connections_group.setLayout(connections_layout)
 
@@ -547,7 +544,6 @@ def apply_plugin_settings(self, options):
 
         # To make auto-connection changes take place instantly
         self.main.editor.apply_plugin_settings(options=[connect_n])
-        self.main.extconsole.apply_plugin_settings(options=[connect_n])
         if self.main.ipyconsole is not None:
             self.main.ipyconsole.apply_plugin_settings(options=[connect_n])
 
@@ -816,8 +812,8 @@ def __eventually_raise_help(self, text, force=False):
                and (force or text != self._last_texts[index]):
                 dockwidgets = self.main.tabifiedDockWidgets(self.dockwidget)
                 if self.main.console.dockwidget not in dockwidgets and \
-                   (hasattr(self.main, 'extconsole') and \
-                    self.main.extconsole.dockwidget not in dockwidgets):
+                   (hasattr(self.main, 'ipyconsole') and \
+                    self.main.ipyconsole.dockwidget not in dockwidgets):
                     self.dockwidget.show()
                     self.dockwidget.raise_()
         self._last_texts[index] = text
@@ -901,8 +897,6 @@ def get_shell(self):
                 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 and self.main.extconsole is not None:
-                self.shell = self.main.extconsole.get_running_python_shell()
             if self.shell is None:
                 self.shell = self.internal_shell
         return self.shell