Merge pull request #25033 from ccordoba12/issue-25019

PR: Fix error when kernel fails to start (Profiler)

Author: ccordoba12

spyder/plugins/application/confpage.py

@@ -79,8 +79,7 @@ def setup_page(self):
             section='update_manager'
         )
         disable_zoom_mouse_cb = newcb(
-            _("Disable zoom with mouse wheel"),
-            'disable_zoom_mouse'
+            _("Disable zoom with Ctrl/Cmd + mouse wheel"), "disable_zoom_mouse"
         )
 
         # Decide if it's possible to activate or not single instance mode

spyder/plugins/ipythonconsole/widgets/shell.py

@@ -1560,13 +1560,13 @@ def focusOutEvent(self, event):
         return super().focusOutEvent(event)
 
     def eventFilter(self, obj, event):
-        etype = event.type()
         if (
-            etype == QEvent.Wheel
+            event.type() == QEvent.Wheel
             and self._control_key_down(event.modifiers())
             and self.get_conf('disable_zoom_mouse', section='main')
         ):
             return False
+
         return super().eventFilter(obj, event)
 
     # ---- Python methods

spyder/plugins/profiler/widgets/main_widget.py

@@ -394,7 +394,7 @@ def update_actions(self):
                     callers_or_callees_action.setChecked(False)
                     callers_or_callees_action.setEnabled(False)
 
-        if widget is not None:
+        if not widget_inactive:
             if widget.is_profiling:
                 self.start_spinner()
             else:
@@ -420,7 +420,8 @@ def update_actions(self):
             # ProfilerWidgetActions.Home,
             ProfilerWidgetActions.SlowLocal,
             ProfilerWidgetActions.SaveData,
-            ProfilerWidgetActions.Search
+            ProfilerWidgetActions.LoadData,
+            ProfilerWidgetActions.Search,
         ]:
             action = self.get_action(action_name)
             if action_name in [
@@ -430,6 +431,8 @@ def update_actions(self):
                 action.setEnabled(
                     not tree_empty and not callers_or_callees_enabled
                 )
+            elif action_name == ProfilerWidgetActions.LoadData:
+                action.setEnabled(not widget_inactive)
             else:
                 action.setEnabled(not tree_empty)
 

spyder/utils/tests/test_vcs.py

@@ -11,7 +11,6 @@
 # Standard library imports
 import os
 import os.path as osp
-import sys
 
 # Test library imports
 from spyder.utils import programs
@@ -31,7 +30,7 @@
 
 
 @skipnogit
-@pytest.mark.skipif(running_in_ci(), reason="Not to be run outside of CIs")
+@pytest.mark.skipif(not running_in_ci(), reason="Not to be run outside of CIs")
 def test_vcs_tool():
     if not os.name == 'nt':
         with pytest.raises(ActionToolNotFound):