Merge pull request #643 from tirkarthi/fix-threading

Fix threading module related DeprecationWarning.
pyserial · Aug 17, 2023 · 52c73fc · 52c73fc
2 parents c3ecedf + 3c88952
commit 52c73fc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/examples/wxTerminal.py b/examples/wxTerminal.py
@@ -166,13 +166,13 @@ def __init__(self, *args, **kwds):
         # end wxGlade
         self.__attach_events()          # register events
         self.OnPortSettings(None)       # call setup dialog on startup, opens port
-        if not self.alive.isSet():
+        if not self.alive.is_set():
             self.Close()
 
     def StartThread(self):
         """Start the receiver thread"""
         self.thread = threading.Thread(target=self.ComPortThread)
-        self.thread.setDaemon(1)
+        self.thread.daemon = True
         self.alive.set()
         self.thread.start()
         self.serial.rts = True
@@ -332,7 +332,7 @@ def ComPortThread(self):
         Thread that handles the incoming traffic. Does the basic input
         transformation (newlines) and generates an SerialRxEvent
         """
-        while self.alive.isSet():
+        while self.alive.is_set():
             b = self.serial.read(self.serial.in_waiting or 1)
             if b:
                 # newline transformation

diff --git a/serial/rfc2217.py b/serial/rfc2217.py
@@ -462,7 +462,7 @@ def open(self):
 
         self.is_open = True
         self._thread = threading.Thread(target=self._telnet_read_loop)
-        self._thread.setDaemon(True)
+        self._thread.daemon = True
         self._thread.setName('pySerial RFC 2217 reader thread for {}'.format(self._port))
         self._thread.start()
 

diff --git a/serial/urlhandler/protocol_cp2110.py b/serial/urlhandler/protocol_cp2110.py
@@ -99,7 +99,7 @@ def open(self):
         else:
             self.is_open = True
             self._thread = threading.Thread(target=self._hid_read_loop)
-            self._thread.setDaemon(True)
+            self._thread.daemon = True
             self._thread.setName('pySerial CP2110 reader thread for {}'.format(self._port))
             self._thread.start()
 

diff --git a/test/test.py b/test/test.py
@@ -106,8 +106,8 @@ def run(self):
             self.serial.write(b"E")
             self.serial.flush()
 
-    def isSet(self):
-        return self.x.isSet()
+    def is_set(self):
+        return self.x.is_set()
 
     def stop(self):
         self.stopped = 1
@@ -130,8 +130,8 @@ def test2_ReadEmpty(self):
         """no timeout: after port open, the input buffer must be empty (read).
         a character is sent after some time to terminate the test (SendEvent)."""
         c = self.s.read(1)
-        if not (self.event.isSet() and c == b'E'):
-            self.fail("expected marker (evt={!r}, c={!r})".format(self.event.isSet(), c))
+        if not (self.event.is_set() and c == b'E'):
+            self.fail("expected marker (evt={!r}, c={!r})".format(self.event.is_set(), c))
 
 
 class Test2_Forever(unittest.TestCase):