Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
goanpeca committed May 25, 2020
1 parent db64661 commit a0b85ba
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion spyder/api/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
7 changes: 4 additions & 3 deletions spyder/app/mainwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions spyder/plugins/console/widgets/main_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down

0 comments on commit a0b85ba

Please sign in to comment.