evdev 1.7.1__tar.gz → 1.8.0__tar.gz

{evdev-1.7.1 → evdev-1.8.0}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2023 Georgi Valkov. All rights reserved.
+Copyright (c) 2012-2025 Georgi Valkov. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

{evdev-1.7.1 → evdev-1.8.0}/MANIFEST.in

@@ -2,3 +2,4 @@
 # evdev headers of the running kernel. Refer to the 'build_ecodes' distutils
 # command in setup.py.
 exclude evdev/ecodes.c
+include evdev/ecodes.py

{evdev-1.7.1/evdev.egg-info → evdev-1.8.0}/PKG-INFO

@@ -1,10 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: evdev
-Version: 1.7.1
+Version: 1.8.0
 Summary: Bindings to the Linux input handling subsystem
 Author-email: Georgi Valkov <georgi.t.valkov@gmail.com>
 Maintainer-email: Tobi <proxima@sezanzeb.de>
-License: Copyright (c) 2012-2023 Georgi Valkov. All rights reserved.
+License: Copyright (c) 2012-2025 Georgi Valkov. All rights reserved.
         
         Redistribution and use in source and binary forms, with or without
         modification, are permitted provided that the following conditions are
@@ -43,7 +43,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
@@ -52,6 +52,7 @@ License-File: LICENSE
 <p>
     <a href="https://pypi.python.org/pypi/evdev"><img alt="pypi version" src="https://img.shields.io/pypi/v/evdev.svg"></a>
     <a href="https://github.com/gvalkov/python-evdev/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/pypi/l/evdev"></a>
+    <a href="https://repology.org/project/python:evdev/versions"><img alt="Packaging status" src="https://repology.org/badge/tiny-repos/python:evdev.svg"></a>
 </p>
 
 This package provides bindings to the generic input event interface in Linux.

{evdev-1.7.1 → evdev-1.8.0}/README.md

@@ -3,6 +3,7 @@
 <p>
     <a href="https://pypi.python.org/pypi/evdev"><img alt="pypi version" src="https://img.shields.io/pypi/v/evdev.svg"></a>
     <a href="https://github.com/gvalkov/python-evdev/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/pypi/l/evdev"></a>
+    <a href="https://repology.org/project/python:evdev/versions"><img alt="Packaging status" src="https://repology.org/badge/tiny-repos/python:evdev.svg"></a>
 </p>
 
 This package provides bindings to the generic input event interface in Linux.

evdev-1.8.0/evdev/__init__.py

@@ -0,0 +1,9 @@
+# --------------------------------------------------------------------------
+# Gather everything into a single, convenient namespace.
+# --------------------------------------------------------------------------
+
+from . import ecodes, ff
+from .device import AbsInfo, DeviceInfo, EvdevError, InputDevice
+from .events import AbsEvent, InputEvent, KeyEvent, RelEvent, SynEvent, event_factory
+from .uinput import UInput, UInputError
+from .util import categorize, list_devices, resolve_ecodes, resolve_ecodes_dict

{evdev-1.7.1 → evdev-1.8.0}/evdev/device.py

@@ -1,23 +1,22 @@
 # encoding: utf-8
 
+import collections
+import contextlib
 import os
 import warnings
-import contextlib
-import collections
 
-from evdev import _input, ecodes, util
-from evdev.events import InputEvent
+from . import _input, ecodes, util
 
 try:
-    from evdev.eventio_async import EventIO, EvdevError
+    from .eventio_async import EvdevError, EventIO
 except ImportError:
-    from evdev.eventio import EventIO, EvdevError
+    from .eventio import EvdevError, EventIO
 
 
 # --------------------------------------------------------------------------
 _AbsInfo = collections.namedtuple("AbsInfo", ["value", "min", "max", "fuzz", "flat", "resolution"])
 
-_KbdInfo = collections.namedtuple("KbdInfo", ["repeat", "delay"])
+_KbdInfo = collections.namedtuple("KbdInfo", ["delay", "repeat"])
 
 _DeviceInfo = collections.namedtuple("DeviceInfo", ["bustype", "vendor", "product", "version"])
 
@@ -70,16 +69,16 @@ class KbdInfo(_KbdInfo):
 
     Attributes
     ----------
-    repeat
-      Keyboard repeat rate in characters per second.
-
     delay
       Amount of time that a key must be depressed before it will start
       to repeat (in milliseconds).
+
+    repeat
+      Keyboard repeat rate in characters per second.
     """
 
     def __str__(self):
-        return "repeat {}, delay {}".format(*self)
+        return "delay {}, repeat {}".format(*self)
 
 
 class DeviceInfo(_DeviceInfo):

evdev-1.8.0/evdev/ecodes.py

@@ -0,0 +1,5 @@
+# When installed, this module is replaced by an ecodes.py generated at 
+# build time by genecodes_py.py (see build_ext in setup.py).
+
+# This stub exists to make development of evdev itself more convenient. 
+from . ecodes_runtime import *

evdev-1.7.1/evdev/ecodes.py → evdev-1.8.0/evdev/ecodes_runtime.py

@@ -1,3 +1,4 @@
+# pylint: disable=undefined-variable
 """
 This modules exposes the integer constants defined in ``linux/input.h`` and
 ``linux/input-event-codes.h``.
@@ -32,26 +33,26 @@ Keep in mind that values in reverse mappings may point to one or more event
 codes. For example::
 
     >>> evdev.ecodes.FF[80]
-    ['FF_EFFECT_MIN', 'FF_RUMBLE']
+    ('FF_EFFECT_MIN', 'FF_RUMBLE')
 
     >>> evdev.ecodes.FF[81]
     'FF_PERIODIC'
 """
 
 from inspect import getmembers
-from evdev import _ecodes
 
+from . import _ecodes
 
 #: 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"
+prefixes = "KEY ABS REL SW MSC LED BTN REP SND ID EV BUS SYN FF_STATUS FF INPUT_PROP".split()
 prev_prefix = ""
 g = globals()
 
 # eg. code: 'REL_Z', val: 2
 for code, val in getmembers(_ecodes):
-    for prefix in prefixes.split():  # eg. 'REL'
+    for prefix in prefixes:  # eg. 'REL'
         if code.startswith(prefix):
             ecodes[code] = val
             # FF_STATUS codes should not appear in the FF reverse mapping
@@ -70,6 +71,15 @@ for code, val in getmembers(_ecodes):
 
         prev_prefix = prefix
 
+
+# Convert lists to tuples.
+k, v = None, None
+for prefix in prefixes:
+    for k, v in g[prefix].items():
+        if isinstance(v, list):
+            g[prefix][k] = tuple(v)
+
+
 #: Keys are a combination of all BTN and KEY codes.
 keys = {}
 keys.update(BTN)
@@ -98,4 +108,4 @@ bytype = {
 from evdev._ecodes import *
 
 # cheaper than whitelisting in an __all__
-del code, val, prefix, getmembers, g, d, prefixes, prev_prefix
+del code, val, prefix, getmembers, g, d, k, v, prefixes, prev_prefix

{evdev-1.7.1 → evdev-1.8.0}/evdev/eventio.py

@@ -1,10 +1,10 @@
-import os
 import fcntl
-import select
 import functools
+import os
+import select
 
-from evdev import _input, _uinput, ecodes, util
-from evdev.events import InputEvent
+from . import _input, _uinput, ecodes
+from .events import InputEvent
 
 
 # --------------------------------------------------------------------------
@@ -72,6 +72,7 @@ class EventIO:
         for event in events:
             yield InputEvent(*event)
 
+    # pylint: disable=no-self-argument
     def need_write(func):
         """
         Decorator that raises :class:`EvdevError` if there is no write access to the
@@ -82,6 +83,7 @@ class EventIO:
         def wrapper(*args):
             fd = args[0].fd
             if fcntl.fcntl(fd, fcntl.F_GETFL) & os.O_RDWR:
+                # pylint: disable=not-callable
                 return func(*args)
             msg = 'no write access to device "%s"' % args[0].path
             raise EvdevError(msg)
@@ -136,5 +138,14 @@ class EventIO:
 
         _uinput.write(self.fd, etype, code, value)
 
+    def syn(self):
+        """
+        Inject a ``SYN_REPORT`` event into the input subsystem. Events
+        queued by :func:`write()` will be fired. If possible, events
+        will be merged into an 'atomic' event.
+        """
+
+        self.write(ecodes.EV_SYN, ecodes.SYN_REPORT, 0)
+
     def close(self):
         pass

{evdev-1.7.1 → evdev-1.8.0}/evdev/eventio_async.py

@@ -1,10 +1,10 @@
 import asyncio
 import select
 
-from evdev import eventio
+from . import eventio
 
 # needed for compatibility
-from evdev.eventio import EvdevError
+from .eventio import EvdevError
 
 
 class EventIO(eventio.EventIO):

{evdev-1.7.1 → evdev-1.8.0}/evdev/events.py

@@ -37,7 +37,8 @@ methods::
 # event type descriptions have been taken mot-a-mot from:
 # http://www.kernel.org/doc/Documentation/input/event-codes.txt
 
-from evdev.ecodes import keys, KEY, SYN, REL, ABS, EV_KEY, EV_REL, EV_ABS, EV_SYN
+# pylint: disable=no-name-in-module
+from .ecodes import ABS, EV_ABS, EV_KEY, EV_REL, EV_SYN, KEY, REL, SYN, keys
 
 
 class InputEvent:
@@ -65,13 +66,13 @@ class InputEvent:
         """Return event timestamp as a float."""
         return self.sec + (self.usec / 1000000.0)
 
-    def __str__(s):
+    def __str__(self):
         msg = "event at {:f}, code {:02d}, type {:02d}, val {:02d}"
-        return msg.format(s.timestamp(), s.code, s.type, s.value)
+        return msg.format(self.timestamp(), self.code, self.type, self.value)
 
-    def __repr__(s):
+    def __repr__(self):
         msg = "{}({!r}, {!r}, {!r}, {!r}, {!r})"
-        return msg.format(s.__class__.__name__, s.sec, s.usec, s.type, s.code, s.value)
+        return msg.format(self.__class__.__name__, self.sec, self.usec, self.type, self.code, self.value)
 
 
 class KeyEvent:
@@ -119,8 +120,8 @@ class KeyEvent:
         msg = "key event at {:f}, {} ({}), {}"
         return msg.format(self.event.timestamp(), self.scancode, self.keycode, ks)
 
-    def __repr__(s):
-        return "{}({!r})".format(s.__class__.__name__, s.event)
+    def __repr__(self):
+        return "{}({!r})".format(self.__class__.__name__, self.event)
 
 
 class RelEvent:
@@ -136,8 +137,8 @@ class RelEvent:
         msg = "relative axis event at {:f}, {}"
         return msg.format(self.event.timestamp(), REL[self.event.code])
 
-    def __repr__(s):
-        return "{}({!r})".format(s.__class__.__name__, s.event)
+    def __repr__(self):
+        return "{}({!r})".format(self.__class__.__name__, self.event)
 
 
 class AbsEvent:
@@ -153,8 +154,8 @@ class AbsEvent:
         msg = "absolute axis event at {:f}, {}"
         return msg.format(self.event.timestamp(), ABS[self.event.code])
 
-    def __repr__(s):
-        return "{}({!r})".format(s.__class__.__name__, s.event)
+    def __repr__(self):
+        return "{}({!r})".format(self.__class__.__name__, self.event)
 
 
 class SynEvent:
@@ -173,8 +174,8 @@ class SynEvent:
         msg = "synchronization event at {:f}, {}"
         return msg.format(self.event.timestamp(), SYN[self.event.code])
 
-    def __repr__(s):
-        return "{}({!r})".format(s.__class__.__name__, s.event)
+    def __repr__(self):
+        return "{}({!r})".format(self.__class__.__name__, self.event)
 
 
 #: A mapping of event types to :class:`InputEvent` sub-classes. Used

{evdev-1.7.1 → evdev-1.8.0}/evdev/evtest.py

@@ -16,21 +16,15 @@ Examples:
   evtest /dev/input/event0 /dev/input/event1
 """
 
-from __future__ import print_function
 
+import atexit
+import optparse
 import re
-import sys
 import select
-import atexit
+import sys
 import termios
-import optparse
-
-try:
-    input = raw_input
-except NameError:
-    pass
 
-from evdev import ecodes, list_devices, AbsInfo, InputDevice
+from . import AbsInfo, InputDevice, ecodes, list_devices
 
 
 def parseopt():

{evdev-1.7.1 → evdev-1.8.0}/evdev/ff.py

@@ -1,6 +1,6 @@
 import ctypes
-from evdev import ecodes
 
+from . import ecodes
 
 _u8 = ctypes.c_uint8
 _u16 = ctypes.c_uint16

evdev-1.8.0/evdev/genecodes_c.py

@@ -0,0 +1,138 @@
+"""
+Generate a Python extension module with the constants defined in linux/input.h.
+"""
+
+import getopt
+import os
+import re
+import sys
+
+# -----------------------------------------------------------------------------
+# The default header file locations to try.
+headers = [
+    "/usr/include/linux/input.h",
+    "/usr/include/linux/input-event-codes.h",
+    "/usr/include/linux/uinput.h",
+]
+
+opts, args = getopt.getopt(sys.argv[1:], "", ["ecodes", "stubs"])
+if not opts:
+    print("usage: genecodes.py [--ecodes|--stubs] <headers>")
+    exit(2)
+
+
+# -----------------------------------------------------------------------------
+macro_regex = r"#define +((?:KEY|ABS|REL|SW|MSC|LED|BTN|REP|SND|ID|EV|BUS|SYN|FF|UI_FF|INPUT_PROP)_\w+)"
+macro_regex = re.compile(macro_regex)
+
+# Uname without hostname.
+uname = list(os.uname())
+uname = " ".join((uname[0], *uname[2:]))
+
+
+# -----------------------------------------------------------------------------
+template_ecodes = r"""
+#include <Python.h>
+#ifdef __FreeBSD__
+#include <dev/evdev/input.h>
+#else
+#include <linux/input.h>
+#include <linux/uinput.h>
+#endif
+
+/* Automatically generated by evdev.genecodes */
+/* Generated on   %s */
+/* Generated from %s */
+
+#define MODULE_NAME "_ecodes"
+#define MODULE_HELP "linux/input.h macros"
+
+static PyMethodDef MethodTable[] = {
+    { NULL, NULL, 0, NULL}
+};
+
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    MODULE_NAME,
+    MODULE_HELP,
+    -1,          /* m_size */
+    MethodTable, /* m_methods */
+    NULL,        /* m_reload */
+    NULL,        /* m_traverse */
+    NULL,        /* m_clear */
+    NULL,        /* m_free */
+};
+
+PyMODINIT_FUNC
+PyInit__ecodes(void)
+{
+    PyObject* m = PyModule_Create(&moduledef);
+    if (m == NULL) return NULL;
+
+%s
+
+    return m;
+}
+"""
+
+
+template_stubs = r"""
+# Automatically generated by evdev.genecodes
+# Generated on %s
+# Generated from %s
+
+# pylint: skip-file
+
+ecodes: dict[str, int]
+keys: dict[int, str|list[str]]
+bytype: dict[int, dict[int, str|list[str]]]
+
+KEY: dict[int, str|list[str]]
+ABS: dict[int, str|list[str]]
+REL: dict[int, str|list[str]]
+SW:  dict[int, str|list[str]]
+MSC: dict[int, str|list[str]]
+LED: dict[int, str|list[str]]
+BTN: dict[int, str|list[str]]
+REP: dict[int, str|list[str]]
+SND: dict[int, str|list[str]]
+ID:  dict[int, str|list[str]]
+EV:  dict[int, str|list[str]]
+BUS: dict[int, str|list[str]]
+SYN: dict[int, str|list[str]]
+FF_STATUS:     dict[int, str|list[str]]
+FF_INPUT_PROP: dict[int, str|list[str]]
+
+%s
+"""
+
+
+def parse_headers(headers=headers):
+    for header in headers:
+        try:
+            fh = open(header)
+        except (IOError, OSError):
+            continue
+
+        for line in fh:
+            macro = macro_regex.search(line)
+            if macro:
+                yield macro.group(1)
+
+
+all_macros = list(parse_headers())
+if not all_macros:
+    print("no input macros found in: %s" % " ".join(headers), file=sys.stderr)
+    sys.exit(1)
+
+# pylint: disable=possibly-used-before-assignment, used-before-assignment
+if ("--ecodes", "") in opts:
+    body = ("    PyModule_AddIntMacro(m, %s);" % macro for macro in all_macros)
+    template = template_ecodes
+elif ("--stubs", "") in opts:
+    body = ("%s: int" % macro for macro in all_macros)
+    template = template_stubs
+
+body = os.linesep.join(body)
+text = template % (uname, headers, body)
+print(text.strip())

evdev-1.8.0/evdev/genecodes_py.py

@@ -0,0 +1,53 @@
+import sys
+from unittest import mock
+from pprint import PrettyPrinter
+
+sys.modules["evdev.ecodes"] = mock.Mock()
+from evdev import ecodes_runtime as ecodes
+
+pprint = PrettyPrinter(indent=2, sort_dicts=True, width=120).pprint
+
+
+print("# Automatically generated by evdev.genecodes_py")
+print()
+print('"""')
+print(ecodes.__doc__.strip())
+print('"""')
+
+print()
+print("from typing import Final, Dict, Tuple, Union")
+print()
+
+for name, value in ecodes.ecodes.items():
+    print(f"{name}: Final[int] = {value}")
+print()
+
+entries = [
+    ("ecodes", "Dict[str, int]", "#: Mapping of names to values."),
+    ("bytype", "Dict[int, Dict[int, Union[str, Tuple[str]]]]", "#: Mapping of event types to other value/name mappings."),
+    ("keys",   "Dict[int, Union[str, Tuple[str]]]", "#: Keys are a combination of all BTN and KEY codes."),
+    ("KEY",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("ABS",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("REL",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("SW",     "Dict[int, Union[str, Tuple[str]]]", None),
+    ("MSC",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("LED",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("BTN",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("REP",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("SND",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("ID",     "Dict[int, Union[str, Tuple[str]]]", None),
+    ("EV",     "Dict[int, Union[str, Tuple[str]]]", None),
+    ("BUS",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("SYN",    "Dict[int, Union[str, Tuple[str]]]", None),
+    ("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)
+]
+
+for key, annotation, doc in entries:
+    if doc:
+        print(doc)
+
+    print(f"{key}: {annotation} = ", end="")
+    pprint(getattr(ecodes, key))
+    print()

{evdev-1.7.1 → evdev-1.8.0}/evdev/uinput.py

@@ -1,3 +1,4 @@
+import ctypes
 import os
 import platform
 import re
@@ -5,11 +6,8 @@ import stat
 import time
 from collections import defaultdict
 
-from evdev import _uinput
-from evdev import ecodes, util, device
-from evdev.events import InputEvent
-import evdev.ff as ff
-import ctypes
+from . import _uinput, device, ecodes, ff, util
+from .events import InputEvent
 
 try:
     from evdev.eventio_async import EventIO
@@ -227,15 +225,6 @@ class UInput(EventIO):
             _uinput.close(self.fd)
             self.fd = -1
 
-    def syn(self):
-        """
-        Inject a ``SYN_REPORT`` event into the input subsystem. Events
-        queued by :func:`write()` will be fired. If possible, events
-        will be merged into an 'atomic' event.
-        """
-
-        _uinput.write(self.fd, ecodes.EV_SYN, ecodes.SYN_REPORT, 0)
-
     def capabilities(self, verbose=False, absinfo=True):
         """See :func:`capabilities <evdev.device.InputDevice.capabilities>`."""
         if self.device is None:
@@ -277,13 +266,11 @@ class UInput(EventIO):
         Verify that an uinput device exists and is readable and writable
         by the current process.
         """
-
         try:
             m = os.stat(self.devnode)[stat.ST_MODE]
-            if not stat.S_ISCHR(m):
-                raise
-        except (IndexError, OSError):
-            msg = '"{}" does not exist or is not a character device file ' "- verify that the uinput module is loaded"
+            assert stat.S_ISCHR(m)
+        except (IndexError, OSError, AssertionError):
+            msg = '"{}" does not exist or is not a character device file - verify that the uinput module is loaded'
             raise UInputError(msg.format(self.devnode))
 
         if not os.access(self.devnode, os.W_OK):

{evdev-1.7.1 → evdev-1.8.0}/evdev/util.py

@@ -1,11 +1,11 @@
-import re
+import collections
+import glob
 import os
+import re
 import stat
-import glob
-import collections
 
-from evdev import ecodes
-from evdev.events import event_factory
+from . import ecodes
+from .events import event_factory
 
 
 def list_devices(input_device_dir="/dev/input"):

{evdev-1.7.1 → evdev-1.8.0/evdev.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: evdev
-Version: 1.7.1
+Version: 1.8.0
 Summary: Bindings to the Linux input handling subsystem
 Author-email: Georgi Valkov <georgi.t.valkov@gmail.com>
 Maintainer-email: Tobi <proxima@sezanzeb.de>
-License: Copyright (c) 2012-2023 Georgi Valkov. All rights reserved.
+License: Copyright (c) 2012-2025 Georgi Valkov. All rights reserved.
         
         Redistribution and use in source and binary forms, with or without
         modification, are permitted provided that the following conditions are
@@ -43,7 +43,7 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: Implementation :: CPython
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
@@ -52,6 +52,7 @@ License-File: LICENSE
 <p>
     <a href="https://pypi.python.org/pypi/evdev"><img alt="pypi version" src="https://img.shields.io/pypi/v/evdev.svg"></a>
     <a href="https://github.com/gvalkov/python-evdev/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/pypi/l/evdev"></a>
+    <a href="https://repology.org/project/python:evdev/versions"><img alt="Packaging status" src="https://repology.org/badge/tiny-repos/python:evdev.svg"></a>
 </p>
 
 This package provides bindings to the generic input event interface in Linux.

{evdev-1.7.1 → evdev-1.8.0}/evdev.egg-info/SOURCES.txt

@@ -6,12 +6,14 @@ setup.py
 evdev/__init__.py
 evdev/device.py
 evdev/ecodes.py
+evdev/ecodes_runtime.py
 evdev/eventio.py
 evdev/eventio_async.py
 evdev/events.py
 evdev/evtest.py
 evdev/ff.py
-evdev/genecodes.py
+evdev/genecodes_c.py
+evdev/genecodes_py.py
 evdev/input.c
 evdev/uinput.c
 evdev/uinput.py

{evdev-1.7.1 → evdev-1.8.0}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "evdev"
-version = "1.7.1"
+version = "1.8.0"
 description = "Bindings to the Linux input handling subsystem"
 keywords = ["evdev", "input", "uinput"]
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">=3.6"
+requires-python = ">=3.8"
 authors = [
   { name="Georgi Valkov", email="georgi.t.valkov@gmail.com" },
 ]
@@ -39,7 +39,7 @@ line-length = 120
 ignore = ["E265", "E241", "F403", "F401", "E401", "E731"]
 
 [tool.bumpversion]
-current_version = "1.7.1"
+current_version = "1.8.0"
 commit = true
 tag = true
 allow_dirty = true
@@ -49,3 +49,12 @@ filename = "pyproject.toml"
 
 [[tool.bumpversion.files]]
 filename = "docs/conf.py"
+
+[tool.pylint.'MESSAGES CONTROL']
+disable = """
+    no-member,
+"""
+
+[tool.pylint.typecheck]
+generated-members = ["evdev.ecodes.*"]
+ignored-modules= ["evdev._*"]

{evdev-1.7.1 → evdev-1.8.0}/setup.py

@@ -1,14 +1,16 @@
 import os
 import sys
+import shutil
 import textwrap
 from pathlib import Path
+from subprocess import run
 
 from setuptools import setup, Extension, Command
 from setuptools.command import build_ext as _build_ext
 
 
 curdir = Path(__file__).resolve().parent
-ecodes_path = curdir / "evdev/ecodes.c"
+ecodes_c_path = curdir / "evdev/ecodes.c"
 
 
 def create_ecodes(headers=None):
@@ -47,16 +49,18 @@ def create_ecodes(headers=None):
               build_ecodes --evdev-headers path/input.h:path/input-event-codes.h \\
               build_ext --include-dirs path/ \\
               install
+
+        If you want to avoid building this package from source, then please consider
+        installing the `evdev-binary` package instead. Keep in mind that it may not be
+        fully compatible with, or support all the features of your current kernel.
         """
 
         sys.stderr.write(textwrap.dedent(msg))
         sys.exit(1)
 
-    from subprocess import run
-
-    print("writing %s (using %s)" % (ecodes_path, " ".join(headers)))
-    with ecodes_path.open("w") as fh:
-        cmd = [sys.executable, "evdev/genecodes.py", *headers]
+    print("writing %s (using %s)" % (ecodes_c_path, " ".join(headers)))
+    with ecodes_c_path.open("w") as fh:
+        cmd = [sys.executable, "evdev/genecodes_c.py", "--ecodes", *headers]
         run(cmd, check=True, stdout=fh)
 
 
@@ -80,14 +84,27 @@ class build_ecodes(Command):
 
 class build_ext(_build_ext.build_ext):
     def has_ecodes(self):
-        if ecodes_path.exists():
+        if ecodes_c_path.exists():
             print("ecodes.c already exists ... skipping build_ecodes")
-        return not ecodes_path.exists()
+            return False
+        return True
+
+    def generate_ecodes_py(self):
+        ecodes_py = Path(self.build_lib) / "evdev/ecodes.py"
+        print(f"writing {ecodes_py}")
+        with ecodes_py.open("w") as fh:
+            cmd = [sys.executable, "-B", "evdev/genecodes_py.py"]
+            res = run(cmd, env={"PYTHONPATH": self.build_lib}, stdout=fh)
+
+        if res.returncode != 0:
+            print(f"failed to generate static {ecodes_py} - will use ecodes_runtime.py")
+            shutil.copy("evdev/ecodes_runtime.py", ecodes_py)
 
     def run(self):
         for cmd_name in self.get_sub_commands():
             self.run_command(cmd_name)
         _build_ext.build_ext.run(self)
+        self.generate_ecodes_py()
 
     sub_commands = [("build_ecodes", has_ecodes)] + _build_ext.build_ext.sub_commands
 

{evdev-1.7.1 → evdev-1.8.0}/tests/test_uinput.py

@@ -1,10 +1,13 @@
 # encoding: utf-8
-
+import os
+import stat
 from select import select
-from pytest import raises, fixture
+from unittest.mock import patch
 
-from evdev import uinput, ecodes, events, device, util
+import pytest
+from pytest import raises, fixture
 
+from evdev import uinput, ecodes, device, UInputError
 
 # -----------------------------------------------------------------------------
 uinput_options = {
@@ -66,12 +69,12 @@ def test_enable_events(c):
 
 def test_abs_values(c):
     e = ecodes
-    c["events"] = {
+    c = {
         e.EV_KEY: [e.KEY_A, e.KEY_B],
-        e.EV_ABS: [(e.ABS_X, (0, 255, 0, 0)), (e.ABS_Y, device.AbsInfo(0, 255, 5, 10, 0, 0))],
+        e.EV_ABS: [(e.ABS_X, (0, 0, 255, 0, 0)), (e.ABS_Y, device.AbsInfo(0, 0, 255, 5, 10, 0))],
     }
 
-    with uinput.UInput(**c) as ui:
+    with uinput.UInput(events=c) as ui:
         c = ui.capabilities()
         abs = device.AbsInfo(value=0, min=0, max=255, fuzz=0, flat=0, resolution=0)
         assert c[e.EV_ABS][0] == (0, abs)
@@ -114,3 +117,21 @@ def test_write(c):
                 assert evs[3].code == ecodes.KEY_A and evs[3].value == 2
                 assert evs[4].code == ecodes.KEY_A and evs[4].value == 0
                 break
+
+
+@patch.object(stat, 'S_ISCHR', return_value=False)
+def test_not_a_character_device(ischr_mock, c):
+    with pytest.raises(UInputError, match='not a character device file'):
+        uinput.UInput(**c)
+
+@patch.object(stat, 'S_ISCHR', return_value=True)
+@patch.object(os, 'stat', side_effect=OSError())
+def test_not_a_character_device_2(stat_mock, ischr_mock, c):
+    with pytest.raises(UInputError, match='not a character device file'):
+        uinput.UInput(**c)
+
+@patch.object(stat, 'S_ISCHR', return_value=True)
+@patch.object(os, 'stat', return_value=[])
+def test_not_a_character_device_3(stat_mock, ischr_mock, c):
+    with pytest.raises(UInputError, match='not a character device file'):
+        uinput.UInput(**c)

evdev-1.7.1/evdev/__init__.py

@@ -1,10 +0,0 @@
-# --------------------------------------------------------------------------
-# Gather everything into a single, convenient namespace.
-# --------------------------------------------------------------------------
-
-from evdev.device import DeviceInfo, InputDevice, AbsInfo, EvdevError
-from evdev.events import InputEvent, KeyEvent, RelEvent, SynEvent, AbsEvent, event_factory
-from evdev.uinput import UInput, UInputError
-from evdev.util import list_devices, categorize, resolve_ecodes, resolve_ecodes_dict
-from evdev import ecodes
-from evdev import ff

evdev-1.7.1/evdev/genecodes.py

@@ -1,96 +0,0 @@
-"""
-Generate a Python extension module with the constants defined in linux/input.h.
-"""
-
-from __future__ import print_function
-import os, sys, re
-
-
-# -----------------------------------------------------------------------------
-# The default header file locations to try.
-headers = [
-    "/usr/include/linux/input.h",
-    "/usr/include/linux/input-event-codes.h",
-    "/usr/include/linux/uinput.h",
-]
-
-if sys.argv[1:]:
-    headers = sys.argv[1:]
-
-
-# -----------------------------------------------------------------------------
-macro_regex = r"#define +((?:KEY|ABS|REL|SW|MSC|LED|BTN|REP|SND|ID|EV|BUS|SYN|FF|UI_FF|INPUT_PROP)_\w+)"
-macro_regex = re.compile(macro_regex)
-
-uname = list(os.uname())
-del uname[1]
-uname = " ".join(uname)
-
-
-# -----------------------------------------------------------------------------
-template = r"""
-#include <Python.h>
-#ifdef __FreeBSD__
-#include <dev/evdev/input.h>
-#else
-#include <linux/input.h>
-#include <linux/uinput.h>
-#endif
-
-/* Automatically generated by evdev.genecodes */
-/* Generated on %s */
-
-#define MODULE_NAME "_ecodes"
-#define MODULE_HELP "linux/input.h macros"
-
-static PyMethodDef MethodTable[] = {
-    { NULL, NULL, 0, NULL}
-};
-
-static struct PyModuleDef moduledef = {
-    PyModuleDef_HEAD_INIT,
-    MODULE_NAME,
-    MODULE_HELP,
-    -1,          /* m_size */
-    MethodTable, /* m_methods */
-    NULL,        /* m_reload */
-    NULL,        /* m_traverse */
-    NULL,        /* m_clear */
-    NULL,        /* m_free */
-};
-
-PyMODINIT_FUNC
-PyInit__ecodes(void)
-{
-    PyObject* m = PyModule_Create(&moduledef);
-    if (m == NULL) return NULL;
-
-%s
-
-    return m;
-}
-"""
-
-
-def parse_header(header):
-    for line in open(header):
-        macro = macro_regex.search(line)
-        if macro:
-            yield "    PyModule_AddIntMacro(m, %s);" % macro.group(1)
-
-
-all_macros = []
-for header in headers:
-    try:
-        fh = open(header)
-    except (IOError, OSError):
-        continue
-    all_macros += parse_header(header)
-
-if not all_macros:
-    print("no input macros found in: %s" % " ".join(headers), file=sys.stderr)
-    sys.exit(1)
-
-
-macros = os.linesep.join(all_macros)
-print(template % (uname, macros))