Merge pull request #1964 from cslecrone/issue-1958

Addresses #1958: Move code that handles job into its own method

Author: njsmith

trio/_core/_thread_cache.py

@@ -56,21 +56,24 @@ def __init__(self, thread_cache):
         thread.name = f"Trio worker thread {next(name_counter)}"
         thread.start()
 
+    def _handle_job(self):
+        # Handle job in a separate method to ensure user-created
+        # objects are cleaned up in a consistent manner.
+        fn, deliver = self._job
+        self._job = None
+        result = outcome.capture(fn)
+        # Tell the cache that we're available to be assigned a new
+        # job. We do this *before* calling 'deliver', so that if
+        # 'deliver' triggers a new job, it can be assigned to us
+        # instead of spawning a new thread.
+        self._thread_cache._idle_workers[self] = None
+        deliver(result)
+
     def _work(self):
         while True:
             if self._worker_lock.acquire(timeout=IDLE_TIMEOUT):
                 # We got a job
-                fn, deliver = self._job
-                self._job = None
-                result = outcome.capture(fn)
-                # Tell the cache that we're available to be assigned a new
-                # job. We do this *before* calling 'deliver', so that if
-                # 'deliver' triggers a new job, it can be assigned to us
-                # instead of spawning a new thread.
-                self._thread_cache._idle_workers[self] = None
-                deliver(result)
-                del fn
-                del deliver
+                self._handle_job()
             else:
                 # Timeout acquiring lock, so we can probably exit. But,
                 # there's a race condition: we might be assigned a job *just*