refactor: remove deprecate warning from telnetlib.py

and ignore some ruff warnings
espressif · Sep 17, 2024 · 2954d13 · 2954d13
1 parent 6f961f2
commit 2954d13
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/pytest-embedded-jtag/pytest_embedded_jtag/_telnetlib/telnetlib.py b/pytest-embedded-jtag/pytest_embedded_jtag/_telnetlib/telnetlib.py
@@ -36,11 +36,8 @@
 import selectors
 import socket
 import sys
-import warnings
 from time import monotonic as _time
 
-warnings._deprecated(__name__, remove=(3, 13))
-
 __all__ = ["Telnet"]
 
 # Tunable parameters
@@ -250,7 +247,7 @@ def msg(self, msg, *args):
 
         """
         if self.debuglevel > 0:
-            print('Telnet(%s,%s):' % (self.host, self.port), end=' ')
+            print(f'Telnet({self.host},{self.port}):', end=' ')
             if args:
                 print(msg % args)
             else:
@@ -447,7 +444,7 @@ def process_rawq(self):
                     else:
                         self.iacseq += c
                 elif len(self.iacseq) == 1:
-                    # 'IAC: IAC CMD [OPTION only for WILL/WONT/DO/DONT]'
+                    # 'IAC: IAC CMD [OPTION only for WILL/WONT/DO/DONT]'  # noqa: ERA001
                     if c in (DO, DONT, WILL, WONT):
                         self.iacseq += c
                         continue
@@ -586,7 +583,7 @@ def listener(self):
             else:
                 sys.stdout.flush()
 
-    def expect(self, list, timeout=None):
+    def expect(self, list, timeout=None):  # noqa: A002
         """Read until one from a list of a regular expressions matches.
 
         The first argument is a list of regular expressions, either
@@ -609,11 +606,12 @@ def expect(self, list, timeout=None):
 
         """
         re = None
-        list = list[:]
+        list = list[:]  # noqa: A001
         indices = range(len(list))
         for i in indices:
             if not hasattr(list[i], "search"):
-                if not re: import re
+                if not re:
+                    import re
                 list[i] = re.compile(list[i])
         if timeout is not None:
             deadline = _time() + timeout
@@ -645,7 +643,7 @@ def expect(self, list, timeout=None):
     def __enter__(self):
         return self
 
-    def __exit__(self, type, value, traceback):
+    def __exit__(self, type, value, traceback):  # noqa: A002
         self.close()