linting fixups

Author: codedstructure

src/pylibftdi/__init__.py

@@ -37,8 +37,6 @@
     "USB_PID_LIST",
 ]
 
-import sys
-
 from pylibftdi import _base, bitbang, device, driver, serial_device, util
 
 # Bring them in to package scope so we can treat pylibftdi

src/pylibftdi/device.py

@@ -266,14 +266,14 @@ def open(self) -> None:
         self.ctx = create_string_buffer(1024)
         res = self.fdll.ftdi_init(byref(self.ctx))
         if res != 0:
-            msg = "%s (%d)" % (self.get_error_string(), res)
+            msg = f"{self.get_error_string()} ({res})"
             del self.ctx
             raise FtdiError(msg)
 
         if self.interface_select is not None:
             res = self.fdll.ftdi_set_interface(byref(self.ctx), self.interface_select)
             if res != 0:
-                msg = "%s (%d)" % (self.get_error_string(), res)
+                msg = f"{self.get_error_string()} ({res})"
                 del self.ctx
                 raise FtdiError(msg)
 
@@ -326,7 +326,7 @@ def handle_open_error(self, errcode: int) -> str:
                 err_help = ERR_HELP_MACOS_CLAIM_FAIL
             else:
                 err_help = ERR_HELP_CLAIM_FAIL
-        msg = "%s (%d)\n%s" % (self.get_error_string(), errcode, err_help)
+        msg = f"{self.get_error_string()} ({errcode})\n{err_help}"
         return msg
 
     def _open_device(self) -> int:
@@ -507,7 +507,7 @@ def flush(self, flush_what: int = FLUSH_BOTH) -> None:
 
         res = fn(byref(self.ctx))
         if res != 0:
-            msg = "%s (%d)" % (self.get_error_string(), res)
+            msg = f"{self.get_error_string()} ({res})"
             raise FtdiError(msg)
 
     def flush_input(self) -> None:

src/pylibftdi/driver.py

@@ -270,7 +270,7 @@ def _s(s: bytes) -> str:
                 )
                 if res < 0:
                     err_msg = self.fdll.ftdi_get_error_string(byref(ctx))
-                    msg = "%s (%d)" % (err_msg, res)
+                    msg = f"{err_msg} ({res})"
                     raise FtdiError(msg)
                 elif res > 0:
                     # take a copy of the dev_list for subsequent list_free
@@ -292,7 +292,7 @@ def _s(s: bytes) -> str:
                             # error codes: -7: manuf, -8: desc, -9: serial
                             if res < 0 and res not in (-7, -8, -9):
                                 err_msg = self.fdll.ftdi_get_error_string(byref(ctx))
-                                msg = "%s (%d)" % (err_msg, res)
+                                msg = f"{err_msg} ({res})"
                                 raise FtdiError(msg)
                             devices.append(
                                 (_s(manuf.value), _s(desc.value), _s(serial.value))

src/pylibftdi/examples/bit_server.py

@@ -114,14 +114,14 @@ def runserver(port=HTTP_PORT):
         pass
 
     t = threading.Thread(target=runserver, args=(HTTP_PORT,))
-    t.setDaemon(True)
+    t.daemon = True
     t.start()
-    print("Webserver running on localhost port %d" % HTTP_PORT)
+    print(f"Webserver running on localhost port {HTTP_PORT}")
     time.sleep(0.5)
     retry = 10
     while retry:
         try:
-            webbrowser.open("http://localhost:%d" % HTTP_PORT)
+            webbrowser.open(f"http://localhost:{HTTP_PORT}")
         except OSError:
             time.sleep(1)
             retry -= 1
@@ -130,7 +130,7 @@ def runserver(port=HTTP_PORT):
 
     # wait for Ctrl-C
     try:
-        while 1:
+        while True:
             time.sleep(100)
     except KeyboardInterrupt:
         pass

src/pylibftdi/examples/midi_output.py

@@ -23,19 +23,19 @@ def scale():
 
     note = START_NOTE
     for i in range(8):
-        midi.write("\x90%c%c" % (chr(note), chr(volume(i))))
+        midi.write(f"\x90{chr(note)}{chr(volume(i))}")
         time.sleep(0.25)
-        midi.write("\x90%c\x00" % chr(note))
+        midi.write(f"\x90{chr(note)}\x00")
         note += MAJOR_INTERVAL[i]
         time.sleep(0.125)
 
     time.sleep(0.5)
 
     for i in range(8):
         note -= MINOR_INTERVAL[7 - i]
-        midi.write("\x90%c%c" % (chr(note), chr(volume(i))))
+        midi.write(f"\x90{chr(note)}{chr(volume(i))}")
         time.sleep(0.35)
-        midi.write("\x90%c\x00" % chr(note))
+        midi.write(f"\x90{chr(note)}\x00")
         time.sleep(0.125)
 
 

src/pylibftdi/examples/pin_read.py

@@ -12,6 +12,7 @@
 All rights reserved.
 """
 
+import argparse
 import itertools
 import sys
 import time
@@ -36,7 +37,7 @@ def display_value(value):
     sys.stdout.write("\b" * 32)
     for n in range(8):
         sys.stdout.write("1 " if value & (1 << (7 - n)) else "0 ")
-    sys.stdout.write("  (%d/0x%02X)" % (value, value))
+    sys.stdout.write(f"  ({value}/0x{value:02X})")
     sys.stdout.flush()
 
 
@@ -78,8 +79,6 @@ def display_loop(interval=1, count=0, match=None, mask=0xFF):
 
 
 def main(args=None):
-    import argparse
-
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "-n",

tests/test_bitbang.py

@@ -55,9 +55,9 @@ def testOpen(self):
         # a lazy_open open() shouldn't do anything
         self.assertCallsExact(lambda: BitBangDevice(lazy_open=True), [])
         # a non-lazy_open open() should open the port...
-        self.assertCalls(lambda: BitBangDevice(), "ftdi_usb_open_desc_index")
+        self.assertCalls(BitBangDevice, "ftdi_usb_open_desc_index")
         # and set the bit mode
-        self.assertCalls(lambda: BitBangDevice(), "ftdi_set_bitmode")
+        self.assertCalls(BitBangDevice, "ftdi_set_bitmode")
         # and given a device_id, it should do a open_desc
         self.assertCalls(lambda: BitBangDevice("bogus"), "ftdi_usb_open_desc_index")
 

tests/test_device.py

@@ -44,7 +44,7 @@ def testOpen(self):
         # a lazy_open open() shouldn't do anything
         self.assertCallsExact(lambda: Device(lazy_open=True), [])
         # a non-lazy_open open() should open the port...
-        self.assertCalls(lambda: Device(), "ftdi_usb_open_desc_index")
+        self.assertCalls(Device, "ftdi_usb_open_desc_index")
         # should be the same with device_id...
         self.assertCalls(lambda: Device("bogus"), "ftdi_usb_open_desc_index")
         # should be the same with device_id...
@@ -53,7 +53,7 @@ def testOpen(self):
     def testOpenInterface(self):
         self.assertCalls(lambda: Device(interface_select=1), "ftdi_set_interface")
         # check that opening a specific interface does that
-        self.assertNotCalls(lambda: Device(), "ftdi_set_interface")
+        self.assertNotCalls(Device, "ftdi_set_interface")
 
     def testReadWrite(self):
         with Device() as dev: