improved handling of .destroy

serwy · serwy · commit 117789567456 · 2018-11-30T02:03:39.000-06:00
diff --git a/tkthread/__init__.py b/tkthread/__init__.py
@@ -170,8 +170,8 @@ def _call_from(self):
             raise  # show the error
         finally:
             if tres:
-                self._results.remove(tres)
                 tres.set(result, error)
+                self._results.discard(tres)
 
     def _tcl_thread(self):
         # Operates in its own thread, with its own Tcl interpreter
@@ -210,9 +210,11 @@ def destroy(self):
         Result objects from being set to error.
         """
         self._running = False
-        self._thread_queue.put(None)
+        self._thread_queue.put(None)  # unblock _tcl_thread queue
         while self._results:
-            tr = self._results.pop()
-            tr.set((RuntimeError, 'destroyed', None),
-                   is_error=True)
-
+            try:
+                tr = self._results.pop()
+                tr.set((RuntimeError, 'destroyed', None),
+                       is_error=True)
+            except KeyError:
+                pass
