evdev 1.9.1__tar.gz → 1.9.2__tar.gz

{evdev-1.9.1/src/evdev.egg-info → evdev-1.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: evdev
-Version: 1.9.1
+Version: 1.9.2
 Summary: Bindings to the Linux input handling subsystem
 Author-email: Georgi Valkov <georgi.t.valkov@gmail.com>
 Maintainer-email: Tobi <proxima@sezanzeb.de>
@@ -46,6 +46,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # evdev
 

{evdev-1.9.1 → evdev-1.9.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "evdev"
-version = "1.9.1"
+version = "1.9.2"
 description = "Bindings to the Linux input handling subsystem"
 keywords = ["evdev", "input", "uinput"]
 readme = "README.md"
@@ -36,7 +36,7 @@ line-length = 120
 ignore = ["E265", "E241", "F403", "F401", "E401", "E731"]
 
 [tool.bumpversion]
-current_version = "1.9.1"
+current_version = "1.9.2"
 commit = true
 tag = true
 allow_dirty = true

{evdev-1.9.1 → evdev-1.9.2}/setup.py

@@ -14,7 +14,7 @@ curdir = Path(__file__).resolve().parent
 ecodes_c_path = curdir / "src/evdev/ecodes.c"
 
 
-def create_ecodes(headers=None):
+def create_ecodes(headers=None, reproducible=False):
     if not headers:
         include_paths = set()
         cpath = os.environ.get("CPATH", "").strip()
@@ -65,7 +65,10 @@ def create_ecodes(headers=None):
 
     print("writing %s (using %s)" % (ecodes_c_path, " ".join(headers)))
     with ecodes_c_path.open("w") as fh:
-        cmd = [sys.executable, "src/evdev/genecodes_c.py", "--ecodes", *headers]
+        cmd = [sys.executable, "src/evdev/genecodes_c.py"]
+        if reproducible:
+            cmd.append("--reproducible")
+        cmd.extend(["--ecodes", *headers])
         run(cmd, check=True, stdout=fh)
 
 
@@ -74,17 +77,21 @@ class build_ecodes(Command):
 
     user_options = [
         ("evdev-headers=", None, "colon-separated paths to input subsystem headers"),
+        ("reproducible", None, "hide host details (host/paths) to create a reproducible output"),
     ]
 
     def initialize_options(self):
         self.evdev_headers = None
+        self.reproducible = False
 
     def finalize_options(self):
         if self.evdev_headers:
             self.evdev_headers = self.evdev_headers.split(":")
+        if self.reproducible is None:
+            self.reproducible = False
 
     def run(self):
-        create_ecodes(self.evdev_headers)
+        create_ecodes(self.evdev_headers, reproducible=self.reproducible)
 
 
 class build_ext(_build_ext.build_ext):

{evdev-1.9.1 → evdev-1.9.2}/src/evdev/device.py

@@ -1,6 +1,6 @@
 import contextlib
 import os
-from typing import Dict, Iterator, List, Literal, NamedTuple, Tuple, Union, overload
+from typing import Dict, Generic, Iterator, List, Literal, NamedTuple, Tuple, TypeVar, Union, overload
 
 from . import _input, ecodes, util
 
@@ -9,6 +9,8 @@ try:
 except ImportError:
     from .eventio import EvdevError, EventIO
 
+_AnyStr = TypeVar("_AnyStr", str, bytes)
+
 
 class AbsInfo(NamedTuple):
     """Absolute axis information.
@@ -100,14 +102,14 @@ class DeviceInfo(NamedTuple):
         return msg.format(*self)  # pylint: disable=not-an-iterable
 
 
-class InputDevice(EventIO):
+class InputDevice(EventIO, Generic[_AnyStr]):
     """
     A linux input device from which input events can be read.
     """
 
     __slots__ = ("path", "fd", "info", "name", "phys", "uniq", "_rawcapabilities", "version", "ff_effects_count")
 
-    def __init__(self, dev: Union[str, bytes, os.PathLike]):
+    def __init__(self, dev: Union[_AnyStr, "os.PathLike[_AnyStr]"]):
         """
         Arguments
         ---------
@@ -116,7 +118,7 @@ class InputDevice(EventIO):
         """
 
         #: Path to input device.
-        self.path = dev if not hasattr(dev, "__fspath__") else dev.__fspath__()
+        self.path: _AnyStr = dev if not hasattr(dev, "__fspath__") else dev.__fspath__()
 
         # Certain operations are possible only when the device is opened in read-write mode.
         try:

{evdev-1.9.1 → evdev-1.9.2}/src/evdev/genecodes_c.py

@@ -15,22 +15,27 @@ headers = [
     "/usr/include/linux/uinput.h",
 ]
 
-opts, args = getopt.getopt(sys.argv[1:], "", ["ecodes", "stubs"])
+opts, args = getopt.getopt(sys.argv[1:], "", ["ecodes", "stubs", "reproducible"])
 if not opts:
-    print("usage: genecodes.py [--ecodes|--stubs] <headers>")
+    print("usage: genecodes.py [--ecodes|--stubs] [--reproducible] <headers>")
     exit(2)
 
 if args:
     headers = args
 
+reproducible = ("--reproducible", "") in opts
+
 
 # -----------------------------------------------------------------------------
 macro_regex = r"#define\s+((?: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:]))
+if reproducible:
+    uname = "hidden for reproducibility"
+else:
+    # Uname without hostname.
+    uname = list(os.uname())
+    uname = " ".join((uname[0], *uname[2:]))
 
 
 # -----------------------------------------------------------------------------
@@ -138,5 +143,5 @@ elif ("--stubs", "") in opts:
     template = template_stubs
 
 body = os.linesep.join(body)
-text = template % (uname, headers, body)
+text = template % (uname, headers if not reproducible else ["hidden for reproducibility"], body)
 print(text.strip())

{evdev-1.9.1 → evdev-1.9.2}/src/evdev/util.py

@@ -6,7 +6,7 @@ import stat
 from typing import Union, List
 
 from . import ecodes
-from .events import InputEvent, event_factory
+from .events import InputEvent, event_factory, KeyEvent, RelEvent, AbsEvent, SynEvent
 
 
 def list_devices(input_device_dir: Union[str, bytes, os.PathLike] = "/dev/input") -> List[str]:
@@ -32,7 +32,7 @@ def is_device(fn: Union[str, bytes, os.PathLike]) -> bool:
     return True
 
 
-def categorize(event: InputEvent) -> InputEvent:
+def categorize(event: InputEvent) -> Union[InputEvent, KeyEvent, RelEvent, AbsEvent, SynEvent]:
     """
     Categorize an event according to its type.
 

{evdev-1.9.1 → evdev-1.9.2/src/evdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: evdev
-Version: 1.9.1
+Version: 1.9.2
 Summary: Bindings to the Linux input handling subsystem
 Author-email: Georgi Valkov <georgi.t.valkov@gmail.com>
 Maintainer-email: Tobi <proxima@sezanzeb.de>
@@ -46,6 +46,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: license-file
 
 # evdev