Fix for UI_FF constants missing from generated ecodes.py

Author: gvalkov

.github/workflows/test.yml

@@ -21,7 +21,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Run pytest tests
-        # pip install -e . builds _ecodes and such into the evdev directory
         # sudo required to write to uinputs
         run: |
           sudo python -m pip install pytest setuptools

src/evdev/__init__.py

@@ -2,13 +2,21 @@
 # Gather everything into a single, convenient namespace.
 # --------------------------------------------------------------------------
 
-from . import ecodes as ecodes, ff as ff
+# The superfluous "import name as name" syntax is here to satisfy mypy's attrs-defined rule.
+# Alternarantively all exported objects can be listed in __all__.
+
+from . import (
+    ecodes as ecodes,
+    ff as ff,
+)
+
 from .device import (
     AbsInfo as AbsInfo,
     DeviceInfo as DeviceInfo,
     EvdevError as EvdevError,
     InputDevice as InputDevice,
 )
+
 from .events import (
     AbsEvent as AbsEvent,
     InputEvent as InputEvent,
@@ -17,7 +25,12 @@
     SynEvent as SynEvent,
     event_factory as event_factory,
 )
-from .uinput import UInput as UInput, UInputError as UInputError
+
+from .uinput import (
+    UInput as UInput,
+    UInputError as UInputError,
+)
+
 from .util import (
     categorize as categorize,
     list_devices as list_devices,

src/evdev/ecodes_runtime.py

@@ -46,7 +46,7 @@
 #: Mapping of names to values.
 ecodes = {}
 
-prefixes = "KEY ABS REL SW MSC LED BTN REP SND ID EV BUS SYN FF_STATUS FF INPUT_PROP".split()
+prefixes = "KEY ABS REL SW MSC LED BTN REP SND ID EV BUS SYN FF_STATUS FF INPUT_PROP UI_FF".split()
 prev_prefix = ""
 g = globals()
 

src/evdev/genecodes_py.py

@@ -40,6 +40,7 @@
     ("BUS",    "Dict[int, Union[str, Tuple[str]]]", None),
     ("SYN",    "Dict[int, Union[str, Tuple[str]]]", None),
     ("FF",     "Dict[int, Union[str, Tuple[str]]]", None),
+    ("UI_FF",  "Dict[int, Union[str, Tuple[str]]]", None),
     ("FF_STATUS",  "Dict[int, Union[str, Tuple[str]]]", None),
     ("INPUT_PROP", "Dict[int, Union[str, Tuple[str]]]", None)
 ]
@@ -50,4 +51,4 @@
 
     print(f"{key}: {annotation} = ", end="")
     pprint(getattr(ecodes, key))
-    print()
+    print()

tests/test_ecodes.py

@@ -1,9 +1,8 @@
-# encoding: utf-8
-
 from evdev import ecodes
+from evdev import ecodes_runtime
 
 
-prefixes = "KEY ABS REL SW MSC LED BTN REP SND ID EV BUS SYN FF_STATUS FF"
+prefixes = "KEY ABS REL SW MSC LED BTN REP SND ID EV BUS SYN FF_STATUS FF UI_FF"
 
 
 def to_tuples(val):
@@ -29,3 +28,14 @@ def test_overlap():
     vals_ff = set(to_tuples(ecodes.FF.values()))
     vals_ff_status = set(to_tuples(ecodes.FF_STATUS.values()))
     assert bool(vals_ff & vals_ff_status) is False
+
+
+def test_generated():
+    e_run = vars(ecodes_runtime)
+    e_gen = vars(ecodes)
+
+    def keys(v):
+        res = {k for k in v.keys() if not k.startswith("_") and not k[1].islower()}
+        return res
+
+    assert keys(e_run) == keys(e_gen)