From a0b85baef95c71ba4b27724dd21e13614df968ab Mon Sep 17 00:00:00 2001 From: goanpeca Date: Mon, 25 May 2020 11:56:51 -0500 Subject: [PATCH] Fix --- spyder/api/plugins.py | 2 +- spyder/app/mainwindow.py | 7 ++++--- spyder/plugins/console/widgets/main_widget.py | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/spyder/api/plugins.py b/spyder/api/plugins.py index 672ec8f1811..3eb2f09b4b4 100644 --- a/spyder/api/plugins.py +++ b/spyder/api/plugins.py @@ -1584,7 +1584,7 @@ def set_ancestor(self, ancestor_widget): # ------------------------------------------------------------------------ @property def dockwidget(self): - return self.get_widget().widget.dockwidget + return self.get_widget().dockwidget @property def options_menu(self): diff --git a/spyder/app/mainwindow.py b/spyder/app/mainwindow.py index b3eadcf4076..203a3c0edc6 100644 --- a/spyder/app/mainwindow.py +++ b/spyder/app/mainwindow.py @@ -347,11 +347,12 @@ def register_plugin(self, plugin): # First time plugin starts if plugin.get_conf_option('first_time', True): logger.info("Tabify {} dockwidget...".format(plugin.NAME)) - if isinstance(plugin, SpyderDockablePlugin): + if (isinstance(plugin, SpyderDockablePlugin) + and plugin.NAME != Plugins.Console): try: next_to_plugin = self.get_plugin(plugin.TABIFY) except SpyderAPIError: - next_to_plugin = Plugins.Console + next_to_plugin = self.get_plugin(Plugins.Console) self.tabify_plugins(plugin, next_to_plugin) @@ -4060,7 +4061,7 @@ def run_spyder(app, options, args): if main.console: namespace = CONF.get('internal_console', 'namespace', {}) - main.console.start_interpreter(namespace) + # main.console.start_interpreter(namespace) main.console.set_namespace_item('spy', Spy(app=app, window=main)) # Don't show icons in menus for Mac diff --git a/spyder/plugins/console/widgets/main_widget.py b/spyder/plugins/console/widgets/main_widget.py index 196ece83bf6..01be278e95d 100644 --- a/spyder/plugins/console/widgets/main_widget.py +++ b/spyder/plugins/console/widgets/main_widget.py @@ -259,6 +259,7 @@ def setup(self, options): self.shell.set_external_editor( self.get_option('external_editor/path'), '') + self.start_interpreter(self.get_option('namespace')) def on_option_update(self, option, value): if option == 'max_line_count':