From bf929d2ebe2892624d67992cdef30db14dad72fc Mon Sep 17 00:00:00 2001 From: jsbautista Date: Thu, 30 Jan 2025 22:03:47 -0500 Subject: [PATCH] apply suggestions --- spyder/plugins/ipythonconsole/plugin.py | 7 ------- .../ipythonconsole/widgets/main_widget.py | 12 ++++++++++++ spyder/plugins/maininterpreter/container.py | 4 ---- spyder/plugins/maininterpreter/plugin.py | 17 ----------------- 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/spyder/plugins/ipythonconsole/plugin.py b/spyder/plugins/ipythonconsole/plugin.py index a223c5fcaf0..d63e7281c68 100644 --- a/spyder/plugins/ipythonconsole/plugin.py +++ b/spyder/plugins/ipythonconsole/plugin.py @@ -480,13 +480,6 @@ def on_remote_client_available(self): def on_main_interpreter_available(self): main_interpreter = self.get_plugin(Plugins.MainInterpreter) main_interpreter.sig_environments_updated.connect(self._update_envs) - mi_container = main_interpreter.get_container() - - pythonenv_status = self.get_widget().pythonenv_status - - # connect signals - pythonenv_status.sig_open_preferences_requested.connect( - mi_container.sig_open_preferences_requested) @on_plugin_teardown(plugin=Plugins.Preferences) def on_preferences_teardown(self): diff --git a/spyder/plugins/ipythonconsole/widgets/main_widget.py b/spyder/plugins/ipythonconsole/widgets/main_widget.py index 1559ff37cf5..7cfac1ee6f8 100644 --- a/spyder/plugins/ipythonconsole/widgets/main_widget.py +++ b/spyder/plugins/ipythonconsole/widgets/main_widget.py @@ -388,6 +388,9 @@ def __init__(self, name=None, plugin=None, parent=None): self.pythonenv_status.sig_interpreter_changed.connect( self.sig_interpreter_changed ) + self.pythonenv_status.sig_open_preferences_requested.connect( + self._open_interpreter_preferences + ) # Initial value for the current working directory self._current_working_directory = get_home_dir() @@ -1160,6 +1163,15 @@ def _init_asyncio_patch(self): asyncio.set_event_loop_policy( WindowsSelectorEventLoopPolicy()) + def _open_interpreter_preferences(self): + """Open the Preferences dialog in the main interpreter section.""" + self._main.show_preferences() + preferences = self._main.preferences + container = preferences.get_container() + dlg = container.dialog + index = dlg.get_index_by_name("main_interpreter") + dlg.set_current_index(index) + @Slot() def _create_client_for_kernel(self): """Create a client connected to an existing kernel""" diff --git a/spyder/plugins/maininterpreter/container.py b/spyder/plugins/maininterpreter/container.py index f35dea1709c..91ac366ecbd 100644 --- a/spyder/plugins/maininterpreter/container.py +++ b/spyder/plugins/maininterpreter/container.py @@ -55,10 +55,6 @@ class MainInterpreterContainer(PluginMainContainer): :py:meth:`spyder.utils.envs.get_list_envs`. """ - sig_open_preferences_requested = Signal() - """ - Signal to open the main interpreter preferences. - """ def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/spyder/plugins/maininterpreter/plugin.py b/spyder/plugins/maininterpreter/plugin.py index d555a8bd728..e1cada5fca2 100644 --- a/spyder/plugins/maininterpreter/plugin.py +++ b/spyder/plugins/maininterpreter/plugin.py @@ -62,7 +62,6 @@ class MainInterpreter(SpyderPluginV2): Path to the new interpreter. """ - # ---- SpyderPluginV2 API # ------------------------------------------------------------------------- @staticmethod @@ -83,18 +82,12 @@ def get_icon(cls): def on_initialize(self): container = self.get_container() - # Connect signal to open preferences - container.sig_open_preferences_requested.connect( - self._open_interpreter_preferences - ) - # Connect container signals container.sig_environments_updated.connect( self.sig_environments_updated ) container.sig_interpreter_changed.connect(self.sig_interpreter_changed) - # Validate that the custom interpreter from the previous session # still exists if self.get_conf('custom'): @@ -125,13 +118,3 @@ def set_custom_interpreter(self, interpreter): self.set_conf("custom", True) self.set_conf("custom_interpreter", interpreter) self.set_conf("executable", interpreter) - - # ---- Private API - def _open_interpreter_preferences(self): - """Open the Preferences dialog in the main interpreter section.""" - self._main.show_preferences() - preferences = self._main.preferences - container = preferences.get_container() - dlg = container.dialog - index = dlg.get_index_by_name("main_interpreter") - dlg.set_current_index(index)