Support python evdev 1.8.0

inputremapper/configs/input_config.py

@@ -147,8 +147,6 @@ def _get_name(self) -> Optional[str]:
             # keyboard for example z and y are switched, which will therefore
             # cause the wrong letter to be displayed.
             key_name = get_evdev_constant_name(self.type, self.code)
-            if isinstance(key_name, list):
-                key_name = key_name[0]
 
         key_name = key_name.replace("ABS_Z", "Trigger Left")
         key_name = key_name.replace("ABS_RZ", "Trigger Right")

inputremapper/configs/keyboard_layout.py

@@ -184,17 +184,19 @@ def get_name(self, code: int):
         # This is especially important for BTN_LEFT and such
         btn_name = evdev.ecodes.BTN.get(code, None)
         if btn_name is not None:
-            if type(btn_name) == list:
+            if type(btn_name) in [list, tuple]:
+                # python-evdev >= 1.8.0 uses tuples
                 return btn_name[0]
-            else:
-                return btn_name
+
+            return btn_name
 
         key_name = evdev.ecodes.KEY.get(code, None)
         if key_name is not None:
-            if type(key_name) == list:
+            if type(key_name) in [list, tuple]:
+                # python-evdev >= 1.8.0 uses tuples
                 return key_name[0]
-            else:
-                return key_name
+
+            return key_name
 
         return None
 

inputremapper/utils.py

@@ -53,7 +53,9 @@ def get_evdev_constant_name(type_: Optional[int], code: Optional[int], *_) -> st
     #   type_, code = event.type_and_code
     #   name = evdev.ecodes.bytype[type_][code]
     name = evdev.ecodes.bytype.get(type_, {}).get(code)
-    if isinstance(name, list):
+
+    if type(name) in [list, tuple]:
+        # python-evdev >= 1.8.0 uses tuples
         name = name[0]
 
     if name is None: