backport fixes

spyder-ide · Jun 22, 2023 · b0d21d3 · b0d21d3
1 parent bd3a25a
commit b0d21d3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/external-deps/spyder-kernels-server/spyder_kernels_server/kernel_comm.py b/external-deps/spyder-kernels-server/spyder_kernels_server/kernel_comm.py
diff --git a/external-deps/spyder-kernels-server/spyder_kernels_server/kernel_manager.py b/external-deps/spyder-kernels-server/spyder_kernels_server/kernel_manager.py
diff --git a/spyder/plugins/ipythonconsole/utils/kernel_handler.py b/spyder/plugins/ipythonconsole/utils/kernel_handler.py
@@ -101,14 +101,6 @@ class KernelHandler(QObject):
     The kernel raised an error while connecting.
     """
 
-    _shutdown_thread_list = []
-    """List of running shutdown threads"""
-
-    _shutdown_thread_list_lock = Lock()
-    """
-    Lock to add threads to _shutdown_thread_list or clear that list.
-    """
-
     def __init__(
         self,
         connection_file,

diff --git a/spyder/plugins/ipythonconsole/widgets/main_widget.py b/spyder/plugins/ipythonconsole/widgets/main_widget.py
@@ -38,10 +38,9 @@
 from spyder.plugins.ipythonconsole.utils.style import create_qss_style
 from spyder.plugins.ipythonconsole.widgets import (
     ClientWidget, ConsoleRestartDialog, COMPLETION_WIDGET_TYPE,
-    KernelConnectionDialog, PageControlWidget)
+    KernelConnectionDialog, PageControlWidget, MatplotlibStatus)
 from spyder.plugins.ipythonconsole.widgets.mixins import (
     CachedKernelMixin, KernelConnectorMixin)
-from spyder.py3compat import PY38_OR_MORE
 from spyder.utils import encoding, programs, sourcecode
 from spyder.utils.envs import get_list_envs
 from spyder.utils.misc import get_error_match, remove_backslashes