Merge pull request #87 from mgineer85/master

fix deprecation warning + some lint errors

Author: tiagocoutinho

examples/video/v4l2py-ctl.py

@@ -41,7 +41,7 @@ def show_control_status(device: str) -> None:
             print(f"\n{control_class.name.decode().title()}\n")
 
             for ctrl in controls:
-                print("0x%08x:" % ctrl.id, ctrl)
+                print(f"0x{ctrl.id:08x}:", ctrl)
                 if isinstance(ctrl, MenuControl):
                     for key, value in ctrl.items():
                         print(11 * " ", f" +-- {key}: {value}")
@@ -92,7 +92,7 @@ def set_controls(device: str, controls: list, clipping: bool) -> None:
             else:
                 success = True
 
-            result = "%-5s" % ("OK" if success else "ERROR")
+            result = "{:<5}".format("OK" if success else "ERROR")
 
             if success:
                 print(f"{result} {control}: {value_old} -> {value_new}\n")
@@ -118,7 +118,7 @@ def reset_controls(device: str, controls: list) -> None:
             else:
                 success = True
 
-            result = "%-5s" % ("OK" if success else "ERROR")
+            result = "{:<5}".format("OK" if success else "ERROR")
 
             if success:
                 print(f"{result} {control} reset to {ctrl.default}\n")

linuxpy/gpio/config.py

@@ -236,7 +236,7 @@ def parse_config_lines(lines: Union[Collection, int]) -> list[dict]:
         lines = [lines]
     if isinstance(lines, dict):
         return [{**cfg, "line": line} for line, cfg in lines.items()]
-    if isinstance(lines, (list, tuple)):
+    if isinstance(lines, list | tuple):
         return [parse_config_line(line) for line in lines]
     raise TypeError("lines must be an int, a sequence of int or dict or dict")
 

linuxpy/gpio/raw.py

@@ -195,6 +195,7 @@ class gpiohandle_config(Struct):
 
 class gpiohandle_data(Struct):
     _pack_ = True
+    _layout_ = "ms"
 
 
 gpiohandle_data._fields_ = [("values", cchar * 64)]

linuxpy/midi/raw.py

@@ -222,13 +222,15 @@ class snd_timer_id(Struct):
 
 class snd_seq_addr(Struct):
     _pack_ = True
+    _layout_ = "ms"
 
 
 snd_seq_addr._fields_ = [("client", u8), ("port", u8)]
 
 
 class snd_seq_connect(Struct):
     _pack_ = True
+    _layout_ = "ms"
 
 
 snd_seq_connect._fields_ = [("sender", snd_seq_addr), ("dest", snd_seq_addr)]
@@ -263,6 +265,7 @@ class snd_seq_ev_ctrl(Struct):
 
 class snd_seq_ev_raw8(Struct):
     _pack_ = True
+    _layout_ = "ms"
 
 
 snd_seq_ev_raw8._fields_ = [("d", cchar * 12)]
@@ -277,6 +280,7 @@ class snd_seq_ev_raw32(Struct):
 
 class snd_seq_ev_ext(Struct):
     _pack_ = True
+    _layout_ = "ms"
 
 
 snd_seq_ev_ext._fields_ = [("len", cuint), ("ptr", cvoidp)]
@@ -326,6 +330,7 @@ class M1(Union):
 
 class snd_seq_ev_quote(Struct):
     _pack_ = True
+    _layout_ = "ms"
 
 
 class snd_seq_event(Struct):
@@ -391,6 +396,7 @@ class snd_seq_system_info(Struct):
 
 class snd_seq_running_info(Struct):
     _pack_ = True
+    _layout_ = "ms"
 
 
 snd_seq_running_info._fields_ = [

linuxpy/statfs.py

@@ -85,7 +85,7 @@ class Flag(enum.IntFlag):
 
 
 def get_statfs_raw(path) -> statfs:
-    if not isinstance(path, (bytes, ccharp)):
+    if not isinstance(path, bytes | ccharp):
         path = str(path).encode()
     result = statfs()
     c.statfs(path, pointer(result))