mirror of https://github.com/python/cpython
bpo-43723: Fix deprecation error caused by thread.setDaemon() (GH-25361)
This commit is contained in:
parent
3447750073
commit
95bbb331ec
|
@ -799,7 +799,7 @@ os.close(fd)
|
||||||
|
|
||||||
# Start the server thread and wait for it to be listening.
|
# Start the server thread and wait for it to be listening.
|
||||||
thread = threading.Thread(target=server)
|
thread = threading.Thread(target=server)
|
||||||
thread.setDaemon(True)
|
thread.daemon = True
|
||||||
thread.start()
|
thread.start()
|
||||||
addr = q.get()
|
addr = q.get()
|
||||||
|
|
||||||
|
|
|
@ -849,7 +849,7 @@ class TestSMTPServer(smtpd.SMTPServer):
|
||||||
"""
|
"""
|
||||||
self._thread = t = threading.Thread(target=self.serve_forever,
|
self._thread = t = threading.Thread(target=self.serve_forever,
|
||||||
args=(self.poll_interval,))
|
args=(self.poll_interval,))
|
||||||
t.setDaemon(True)
|
t.daemon = True
|
||||||
t.start()
|
t.start()
|
||||||
|
|
||||||
def serve_forever(self, poll_interval):
|
def serve_forever(self, poll_interval):
|
||||||
|
@ -901,7 +901,7 @@ class ControlMixin(object):
|
||||||
"""
|
"""
|
||||||
self._thread = t = threading.Thread(target=self.serve_forever,
|
self._thread = t = threading.Thread(target=self.serve_forever,
|
||||||
args=(self.poll_interval,))
|
args=(self.poll_interval,))
|
||||||
t.setDaemon(True)
|
t.daemon = True
|
||||||
t.start()
|
t.start()
|
||||||
|
|
||||||
def serve_forever(self, poll_interval):
|
def serve_forever(self, poll_interval):
|
||||||
|
|
|
@ -29,7 +29,7 @@ class GeneralTests(unittest.TestCase):
|
||||||
self.sock.settimeout(60) # Safety net. Look issue 11812
|
self.sock.settimeout(60) # Safety net. Look issue 11812
|
||||||
self.port = socket_helper.bind_port(self.sock)
|
self.port = socket_helper.bind_port(self.sock)
|
||||||
self.thread = threading.Thread(target=server, args=(self.evt,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.thread.start()
|
||||||
self.evt.wait()
|
self.evt.wait()
|
||||||
|
|
||||||
|
|
|
@ -221,7 +221,7 @@ def run_throughput_test(func, args, nthreads):
|
||||||
for i in range(nthreads):
|
for i in range(nthreads):
|
||||||
threads.append(threading.Thread(target=run))
|
threads.append(threading.Thread(target=run))
|
||||||
for t in threads:
|
for t in threads:
|
||||||
t.setDaemon(True)
|
t.daemon = True
|
||||||
t.start()
|
t.start()
|
||||||
# We don't want measurements to include thread startup overhead,
|
# We don't want measurements to include thread startup overhead,
|
||||||
# so we arrange for timing to start after all threads are ready.
|
# 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):
|
for i in range(nthreads):
|
||||||
threads.append(threading.Thread(target=run))
|
threads.append(threading.Thread(target=run))
|
||||||
for t in threads:
|
for t in threads:
|
||||||
t.setDaemon(True)
|
t.daemon = True
|
||||||
t.start()
|
t.start()
|
||||||
# Wait for threads to be ready
|
# Wait for threads to be ready
|
||||||
with ready_cond:
|
with ready_cond:
|
||||||
|
@ -460,7 +460,7 @@ def run_bandwidth_test(func, args, nthreads):
|
||||||
for i in range(nthreads):
|
for i in range(nthreads):
|
||||||
threads.append(threading.Thread(target=run))
|
threads.append(threading.Thread(target=run))
|
||||||
for t in threads:
|
for t in threads:
|
||||||
t.setDaemon(True)
|
t.daemon = True
|
||||||
t.start()
|
t.start()
|
||||||
# Wait for threads to be ready
|
# Wait for threads to be ready
|
||||||
with ready_cond:
|
with ready_cond:
|
||||||
|
|
Loading…
Reference in New Issue