clean up context handling

Author: blink1073

jupyter_client/client.py

@@ -5,7 +5,6 @@
 import sys
 import time
 import typing as t
-import weakref
 from functools import partial
 from getpass import getpass
 from queue import Empty
@@ -94,10 +93,7 @@ class KernelClient(ConnectionFileMixin):
     context = Instance(zmq.asyncio.Context)
 
     def _context_default(self) -> zmq.asyncio.Context:
-        context = zmq.asyncio.Context()
-        # Use a finalizer to destroy the context.
-        self._finalizer = weakref.finalize(self, context.destroy)
-        return context
+        return zmq.asyncio.Context()
 
     # The classes to use for the various channels
     shell_channel_class = Type(ChannelABC)
@@ -116,6 +112,11 @@ def _context_default(self) -> zmq.asyncio.Context:
     # flag for whether execute requests should be allowed to call raw_input:
     allow_stdin: bool = True
 
+    def __del__(self):
+        """Clean up the context when garbage collected."""
+        if not self.channels_running:
+            self.context.destroy()
+
     # --------------------------------------------------------------------------
     # Channel proxy methods
     # --------------------------------------------------------------------------

jupyter_client/multikernelmanager.py

@@ -6,7 +6,6 @@
 import socket
 import typing as t
 import uuid
-import weakref
 
 import zmq
 from traitlets import Any
@@ -107,15 +106,16 @@ def _starting_kernels(self):
 
     @default("context")  # type:ignore[misc]
     def _context_default(self) -> zmq.Context:
-        context = zmq.Context()
-        # Use a finalizer to destroy the context.
-        self._finalizer = weakref.finalize(self, context.destroy)
-        return context
+        return zmq.Context()
 
     connection_dir = Unicode("")
 
     _kernels = Dict()
 
+    def __del__(self):
+        """Clean up the context when garbage collected."""
+        self.context.destroy()
+
     def list_kernel_ids(self) -> t.List[str]:
         """Return a list of the kernel ids of the active kernels."""
         # Create a copy so we can iterate over kernels in operations