Merge pull request #336 from minrk/atexit-teardown

handle classes having been torn down in atexit
jupyter · Jan 17, 2018 · 162cf6f · 162cf6f
2 parents 78951c3 + cd73530
commit 162cf6f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/jupyter_client/channels.py b/jupyter_client/channels.py
@@ -80,7 +80,10 @@ def __init__(self, context=None, session=None, address=None):
     @staticmethod
     @atexit.register
     def _notice_exit():
-        HBChannel._exiting = True
+        # Class definitions can be torn down during interpreter shutdown.
+        # We only need to set _exiting flag if this hasn't happened.
+        if HBChannel is not None:
+            HBChannel._exiting = True
 
     def _create_socket(self):
         if self.socket is not None:

diff --git a/jupyter_client/threaded.py b/jupyter_client/threaded.py
@@ -151,7 +151,10 @@ def __init__(self, loop):
     @staticmethod
     @atexit.register
     def _notice_exit():
-        IOLoopThread._exiting = True
+        # Class definitions can be torn down during interpreter shutdown.
+        # We only need to set _exiting flag if this hasn't happened.
+        if IOLoopThread is not None:
+            IOLoopThread._exiting = True
 
     def run(self):
         """Run my loop, ignoring EINTR events in the poller"""