Skip to content

Commit 94f6a35

Browse files
committed
Resolve Python 3.10 threading deprecation warnings
1 parent 8258348 commit 94f6a35

File tree

7 files changed

+26
-19
lines changed

7 files changed

+26
-19
lines changed

Pythonwin/pywin/dialogs/status.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def ThreadedStatusProgressDialog(title, msg="", maxticks=100):
202202
# event - so use a dumb strategy
203203
end_time = time.time() + 10
204204
while time.time() < end_time:
205-
if t.createdEvent.isSet():
205+
if t.createdEvent.is_set():
206206
break
207207
win32ui.PumpWaitingMessages()
208208
time.sleep(0.1)

com/win32com/demos/excelRTDServer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ def OnServerStart(self):
346346
self.ticker.start()
347347

348348
def OnServerTerminate(self):
349-
if not self.ticker.finished.isSet():
349+
if not self.ticker.finished.is_set():
350350
self.ticker.cancel() # Cancel our wake-up thread. Excel has killed us.
351351

352352
def Update(self):

com/win32com/test/testMSOfficeEvents.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def _WaitForFinish(ob, timeout):
9999
break
100100
pythoncom.PumpWaitingMessages()
101101
stopEvent.wait(0.2)
102-
if stopEvent.isSet():
102+
if stopEvent.is_set():
103103
stopEvent.clear()
104104
break
105105
try:

com/win32com/test/testMarshal.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@ def BeginThreadsSimpleMarshal(self, numThreads):
7272
pythoncom.IID_IDispatch, interp._oleobj_
7373
)
7474
t = threading.Thread(
75-
target=self._testInterpInThread, args=(hEvent, interpStream)
75+
target=self._testInterpInThread,
76+
args=(hEvent, interpStream),
77+
daemon=True, # so errors don't cause shutdown hang
7678
)
77-
t.setDaemon(1) # so errors don't cause shutdown hang
7879
t.start()
7980
threads.append(t)
8081
interp = None
@@ -100,8 +101,11 @@ def BeginThreadsFastMarshal(self, numThreads):
100101
threads = []
101102
for i in range(numThreads):
102103
hEvent = win32event.CreateEvent(None, 0, 0, None)
103-
t = threading.Thread(target=self._testInterpInThread, args=(hEvent, interp))
104-
t.setDaemon(1) # so errors don't cause shutdown hang
104+
t = threading.Thread(
105+
target=self._testInterpInThread,
106+
args=(hEvent, interp),
107+
daemon=True, # so errors don't cause shutdown hang
108+
)
105109
t.start()
106110
events.append(hEvent)
107111
threads.append(t)

isapi/threaded_extension.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ def __init__(self, extension, io_req_port):
2929
self.running = False
3030
self.io_req_port = io_req_port
3131
self.extension = extension
32-
threading.Thread.__init__(self)
33-
# We wait 15 seconds for a thread to terminate, but if it fails to,
34-
# we don't want the process to hang at exit waiting for it...
35-
self.setDaemon(True)
32+
threading.Thread.__init__(
33+
self,
34+
# We wait 15 seconds for a thread to terminate, but if it fails to,
35+
# we don't want the process to hang at exit waiting for it...
36+
daemon=True,
37+
)
3638

3739
def run(self):
3840
self.running = True

win32/test/test_win32file.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,10 @@ def testCompletionPortsNonQueued(self, test_overlapped_death=0):
436436
win32file.CreateIoCompletionPort(handle, port, 1, 0)
437437

438438
t = threading.Thread(
439-
target=self._IOCPServerThread, args=(handle, port, test_overlapped_death)
439+
target=self._IOCPServerThread,
440+
args=(handle, port, test_overlapped_death),
441+
daemon=True, # avoid hanging entire test suite on failure.
440442
)
441-
t.setDaemon(True) # avoid hanging entire test suite on failure.
442443
t.start()
443444
try:
444445
time.sleep(0.1) # let thread do its thing.
@@ -530,7 +531,7 @@ def testAcceptEx(self):
530531
t = threading.Thread(target=self.acceptWorker, args=(port, running, stopped))
531532
t.start()
532533
running.wait(2)
533-
if not running.isSet():
534+
if not running.is_set():
534535
self.fail("AcceptEx Worker thread failed to start")
535536
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
536537
s.connect(("127.0.0.1", port))
@@ -548,7 +549,7 @@ def testAcceptEx(self):
548549
self.assertEqual(got, b"hello")
549550
# thread should have stopped
550551
stopped.wait(2)
551-
if not stopped.isSet():
552+
if not stopped.is_set():
552553
self.fail("AcceptEx Worker thread failed to successfully stop")
553554

554555

win32/test/test_win32pipe.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def testCallNamedPipe(self):
5757
)
5858
self.assertEqual(got, b"bar\0foo")
5959
event.wait(5)
60-
self.assertTrue(event.isSet(), "Pipe server thread didn't terminate")
60+
self.assertTrue(event.is_set(), "Pipe server thread didn't terminate")
6161

6262
def testTransactNamedPipeBlocking(self):
6363
event = threading.Event()
@@ -82,7 +82,7 @@ def testTransactNamedPipeBlocking(self):
8282
hr, got = win32pipe.TransactNamedPipe(hpipe, b"foo\0bar", 1024, None)
8383
self.assertEqual(got, b"bar\0foo")
8484
event.wait(5)
85-
self.assertTrue(event.isSet(), "Pipe server thread didn't terminate")
85+
self.assertTrue(event.is_set(), "Pipe server thread didn't terminate")
8686

8787
def testTransactNamedPipeBlockingBuffer(self):
8888
# Like testTransactNamedPipeBlocking, but a pre-allocated buffer is
@@ -110,7 +110,7 @@ def testTransactNamedPipeBlockingBuffer(self):
110110
hr, got = win32pipe.TransactNamedPipe(hpipe, b"foo\0bar", buffer, None)
111111
self.assertEqual(got, b"bar\0foo")
112112
event.wait(5)
113-
self.assertTrue(event.isSet(), "Pipe server thread didn't terminate")
113+
self.assertTrue(event.is_set(), "Pipe server thread didn't terminate")
114114

115115
def testTransactNamedPipeAsync(self):
116116
event = threading.Event()
@@ -141,7 +141,7 @@ def testTransactNamedPipeAsync(self):
141141
got = buffer[:nbytes]
142142
self.assertEqual(got, b"bar\0foo")
143143
event.wait(5)
144-
self.assertTrue(event.isSet(), "Pipe server thread didn't terminate")
144+
self.assertTrue(event.is_set(), "Pipe server thread didn't terminate")
145145

146146

147147
if __name__ == "__main__":

0 commit comments

Comments
 (0)