From 95bbb331ecb3ef5d05859d90b287cc3d27613c86 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@python.org>
Date: Mon, 12 Apr 2021 13:12:36 +0200
Subject: [PATCH] bpo-43723: Fix deprecation error caused by thread.setDaemon()
 (GH-25361)

---
 Lib/test/test_asyncio/test_streams.py | 2 +-
 Lib/test/test_logging.py              | 4 ++--
 Lib/test/test_telnetlib.py            | 2 +-
 Tools/ccbench/ccbench.py              | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index aa397797758..a0753589039 100644
--- 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 452ba785234..6179e28759c 100644
--- 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 8e36051cd09..41c4fcd4195 100644
--- 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 ab1465a2760..d52701a8294 100644
--- 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: