From 2ec0146b0614a994b134293fea6f078fc38bd447 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Sat, 4 Jan 2025 17:21:26 +0000 Subject: [PATCH] Fix mypyc compatibility (#110) --- bluetooth_devices.py | 1 - hid_devices.py | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bluetooth_devices.py b/bluetooth_devices.py index 987f71a..2fc7a32 100644 --- a/bluetooth_devices.py +++ b/bluetooth_devices.py @@ -240,7 +240,6 @@ async def remove_device(self, device_object_path: str) -> None: if device in list: list.remove(device) await device.finalise() - del device def switch_host(self) -> None: self.current_host_index = (self.current_host_index + 1) % len(self.connected_hosts) diff --git a/hid_devices.py b/hid_devices.py index adcb270..3cb85eb 100644 --- a/hid_devices.py +++ b/hid_devices.py @@ -68,9 +68,10 @@ class FilterDict(TypedDict): DEVICES_CONFIG_COMPATIBILITY_DEVICE_KEY = 'compatibility_devices' CAPTURE_ELEMENT: Literal['capture'] = 'capture' FILTER_ELEMENT: Literal['filter'] = 'filter' -FILTERS_PATH = Path(__file__).parent / "filters" +# TODO: https://github.com/mypyc/mypyc/issues/700 +FILTERS_PATH = Path(".") / "filters" # Path(__file__).parent REPORT_ID_PATTERN = re.compile(r"(a10185)(..)") -SDP_TEMPLATE_PATH = Path(__file__).with_name("sdp_record_template.xml") +SDP_TEMPLATE_PATH = SDP_TEMPLATE_PATH = Path("sdp_record_template.xml") # Path(__file__).with_name("sdp_record_template.xml") SDP_OUTPUT_PATH = Path("/etc/bluetooth/sdp_record.xml") FILTERS: dict[str, FilterDict] = {"_": {"name": "No filter", "func": lambda m: m}} @@ -147,7 +148,7 @@ def __init__(self, device: _Device, filter: HIDMessageFilter, print("HID Device ",self.device_id," created") desc = "".join(f"{b:02x}" for b in _HIDIOCGRDESC(self.hidraw_file)) # Replace report IDs, so they can be remapped later. - self.internal_ids = tuple(m[1] for m in cast(list[str], REPORT_ID_PATTERN.findall(desc))) + self.internal_ids = tuple(m[1] for m in cast(list[tuple[str, str]], REPORT_ID_PATTERN.findall(desc))) self.descriptor, found = REPORT_ID_PATTERN.subn(r"\1{}", desc) # Or insert one if no report ID exists. if found == 0: