Back to basics

gvanrossum · gvanrossum · commit fd13f2325a07 · 2023-10-15T02:20:09.000+02:00
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
@@ -1371,14 +1371,7 @@ def is_active(self):
         return True
 
     def close(self):
-        self._join_threads()
-
-    def _join_threads(self, timeout=None):
-        """Internal: Join all non-daemon threads"""
-        threads = [thread for thread in list(self._threads.values())
-                   if thread.is_alive() and not thread.daemon]
-        for thread in threads:
-            thread.join(timeout)
+        pass
 
         # Clear references to terminated threads
         self._threads = {key: thread for key, thread in self._threads.items()
diff --git a/Lib/test/test_asyncio/utils.py b/Lib/test/test_asyncio/utils.py
@@ -538,7 +538,8 @@ def get_function_source(func):
 
 
 class TestCase(unittest.TestCase):
-    def close_loop(self, loop):
+    @staticmethod
+    def close_loop(loop):
         if loop._default_executor is not None:
             if not loop.is_closed():
                 loop.run_until_complete(loop.shutdown_default_executor())
@@ -557,12 +558,8 @@ def close_loop(self, loop):
                 pass
             else:
                 if isinstance(watcher, asyncio.ThreadedChildWatcher):
-                    watcher._join_threads(timeout=support.SHORT_TIMEOUT)
-                    threads = {key: thread for key, thread in watcher._threads.items()
-                               if thread.is_alive() and not thread.daemon}
-                    if threads:
-                        self.fail(f"watcher still has running threads: "
-                                  f"{threads}")
+                    for thread in list(watcher._threads.values()):
+                        thread.join(timeout=support.SHORT_TIMEOUT)
 
     def set_event_loop(self, loop, *, cleanup=True):
         if loop is None:
