bpo-43723: Fix deprecation error caused by thread.setDaemon() (GH-25361)

diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index aa3977977588e7816ed507feb86d745644d9d2d6..a07535890392027054152a83b43015db968a8bec 100644 (file)
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -799,7 +799,7 @@ os.close(fd)
 
         # Start the server thread and wait for it to be listening.
         thread = threading.Thread(target=server)
-        thread.setDaemon(True)
+        thread.daemon = True
         thread.start()
         addr = q.get()
 

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 452ba78523443e18cd3dfe5fd528e1d17fafcfda..6179e28759cceba8dd917768ceb51aae7271b5fa 100644 (file)
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -849,7 +849,7 @@ class TestSMTPServer(smtpd.SMTPServer):
         """
         self._thread = t = threading.Thread(target=self.serve_forever,
                                             args=(self.poll_interval,))
-        t.setDaemon(True)
+        t.daemon = True
         t.start()
 
     def serve_forever(self, poll_interval):
@@ -901,7 +901,7 @@ class ControlMixin(object):
         """
         self._thread = t = threading.Thread(target=self.serve_forever,
                                             args=(self.poll_interval,))
-        t.setDaemon(True)
+        t.daemon = True
         t.start()
 
     def serve_forever(self, poll_interval):

diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py
index 8e36051cd095ba34a047d0511e5ab5d9a53ba480..41c4fcd4195e3aada7a8cf15da790d2a336c6e70 100644 (file)
--- a/Lib/test/test_telnetlib.py
+++ b/Lib/test/test_telnetlib.py
@@ -29,7 +29,7 @@ class GeneralTests(unittest.TestCase):
         self.sock.settimeout(60)  # Safety net. Look issue 11812
         self.port = socket_helper.bind_port(self.sock)
         self.thread = threading.Thread(target=server, args=(self.evt,self.sock))
-        self.thread.setDaemon(True)
+        self.thread.daemon = True
         self.thread.start()
         self.evt.wait()
 

diff --git a/Tools/ccbench/ccbench.py b/Tools/ccbench/ccbench.py
index ab1465a276092310cd85654aa51b1c1298c52f36..d52701a82948daf32d2c8b5bddbab5d2e6e23588 100644 (file)
--- a/Tools/ccbench/ccbench.py
+++ b/Tools/ccbench/ccbench.py
@@ -221,7 +221,7 @@ def run_throughput_test(func, args, nthreads):
     for i in range(nthreads):
         threads.append(threading.Thread(target=run))
     for t in threads:
-        t.setDaemon(True)
+        t.daemon = True
         t.start()
     # We don't want measurements to include thread startup overhead,
     # so we arrange for timing to start after all threads are ready.
@@ -328,7 +328,7 @@ def run_latency_test(func, args, nthreads):
         for i in range(nthreads):
             threads.append(threading.Thread(target=run))
         for t in threads:
-            t.setDaemon(True)
+            t.daemon = True
             t.start()
         # Wait for threads to be ready
         with ready_cond:
@@ -460,7 +460,7 @@ def run_bandwidth_test(func, args, nthreads):
             for i in range(nthreads):
                 threads.append(threading.Thread(target=run))
             for t in threads:
-                t.setDaemon(True)
+                t.daemon = True
                 t.start()
             # Wait for threads to be ready
             with ready_cond: