# HG changeset patch # User Christian Heimes <christian@python.org> # Date 1618225956 -7200 # Mon Apr 12 13:12:36 2021 +0200 # Node ID 7a8e21a7103a01660b4737a3b98d9571aced8fd9 # Parent 3a06aad28eaaa0bff9cc3040fe8d3e008e1089bb 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 --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -799,7 +799,7 @@ # 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 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -849,7 +849,7 @@ """ 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 @@ """ 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 --- a/Lib/test/test_telnetlib.py +++ b/Lib/test/test_telnetlib.py @@ -29,7 +29,7 @@ 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 --- a/Tools/ccbench/ccbench.py +++ b/Tools/ccbench/ccbench.py @@ -221,7 +221,7 @@ 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 @@ 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 @@ 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: