Move safe_disconnect() to utils/qthelpers.py

spyder/plugins/variableexplorer/widgets/arrayeditor.py

@@ -45,7 +45,8 @@
 from spyder.py3compat import (is_binary_string, is_string, is_text_string,
                               to_binary_string, to_text_string)
 from spyder.utils.icon_manager import ima
-from spyder.utils.qthelpers import add_actions, create_action, keybinding
+from spyder.utils.qthelpers import (
+    add_actions, create_action, keybinding, safe_disconnect)
 from spyder.utils.stylesheet import PANES_TOOLBAR_STYLESHEET
 
 
@@ -128,14 +129,6 @@ def get_idx_rect(index_list):
     return ( min(rows), max(rows), min(cols), max(cols) )
 
 
-def safe_disconnect(signal):
-    """Disconnect a QtSignal, ignoring TypeError"""
-    try:
-        signal.disconnect()
-    except TypeError:
-        # Raised when no slots are connected to the signal
-        pass
-
 #==============================================================================
 # Main classes
 #==============================================================================

spyder/plugins/variableexplorer/widgets/dataframeeditor.py

@@ -58,9 +58,9 @@
 from spyder.py3compat import (is_text_string, is_type_text_string,
                               to_text_string)
 from spyder.utils.icon_manager import ima
-from spyder.utils.qthelpers import (add_actions, create_action,
-                                    MENU_SEPARATOR, keybinding,
-                                    qapplication)
+from spyder.utils.qthelpers import (
+    add_actions, create_action, keybinding, MENU_SEPARATOR, qapplication,
+    safe_disconnect)
 from spyder.plugins.variableexplorer.widgets.arrayeditor import get_idx_rect
 from spyder.plugins.variableexplorer.widgets.basedialog import BaseDialog
 from spyder.utils.palette import QStylePalette
@@ -1753,12 +1753,7 @@ def set_data_and_check(self, data) -> bool:
         self.bgcolor.setChecked(self.dataModel.bgcolor_enabled)
         self.bgcolor.setEnabled(self.dataModel.bgcolor_enabled)
 
-        try:
-            self.bgcolor_global.stateChanged.disconnect()
-        except TypeError:
-            # Raised when no slots are connected to the signal
-            pass
-
+        safe_disconnect(self.bgcolor_global.stateChanged)
         self.bgcolor_global.stateChanged.connect(self.dataModel.colum_avg)
         self.bgcolor_global.setChecked(self.dataModel.colum_avg_enabled)
         self.bgcolor_global.setEnabled(not self.is_series and

spyder/plugins/variableexplorer/widgets/objectexplorer/objectexplorer.py

@@ -31,7 +31,8 @@
     DEFAULT_ATTR_COLS, DEFAULT_ATTR_DETAILS, ToggleColumnTreeView,
     TreeItem, TreeModel, TreeProxyModel)
 from spyder.utils.icon_manager import ima
-from spyder.utils.qthelpers import add_actions, create_toolbutton, qapplication
+from spyder.utils.qthelpers import (
+    add_actions, create_toolbutton, qapplication, safe_disconnect)
 from spyder.utils.stylesheet import PANES_TOOLBAR_STYLESHEET
 from spyder.widgets.simplecodeeditor import SimpleCodeEditor
 
@@ -43,15 +44,6 @@
 EDITOR_NAME = 'Object'
 
 
-def safe_disconnect(signal):
-    """Disconnect a QtSignal, ignoring TypeError"""
-    try:
-        signal.disconnect()
-    except TypeError:
-        # Raised when no slots are connected to the signal
-        pass
-
-
 class ObjectExplorer(BaseDialog, SpyderConfigurationAccessor, SpyderFontsMixin):
     """Object explorer main widget window."""
     CONF_SECTION = 'variable_explorer'

spyder/utils/qthelpers.py

@@ -886,5 +886,14 @@ def handle_applicationStateChanged(state):
     app.applicationStateChanged.connect(handle_applicationStateChanged)
 
 
+def safe_disconnect(signal):
+    """Disconnect a QtSignal, ignoring TypeError"""
+    try:
+        signal.disconnect()
+    except TypeError:
+        # Raised when no slots are connected to the signal
+        pass
+
+
 if __name__ == "__main__":
     show_std_icons()