From efdfdc309ccb2f366a89a020a21ff4ba2838d923 Mon Sep 17 00:00:00 2001 From: Hayden Ball Date: Fri, 23 May 2025 13:55:49 +0100 Subject: [PATCH] fix: Handle Mac Sequoia UUIDs --- smpclient/transport/ble.py | 2 +- tests/test_smp_ble_transport.py | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/smpclient/transport/ble.py b/smpclient/transport/ble.py index 5a378cb..fc50091 100644 --- a/smpclient/transport/ble.py +++ b/smpclient/transport/ble.py @@ -45,7 +45,7 @@ def _session(self) -> GattSession: MAC_ADDRESS_PATTERN: Final = re.compile(r"([0-9A-F]{2}[:]){5}[0-9A-F]{2}$", flags=re.IGNORECASE) UUID_PATTERN: Final = re.compile( - r"^[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}\Z", + r"^[a-f0-9]{8}-?[a-f0-9]{4}-?[a-f0-9]{4}-?[a-f0-9]{4}-?[a-f0-9]{12}\Z", flags=re.IGNORECASE, ) diff --git a/tests/test_smp_ble_transport.py b/tests/test_smp_ble_transport.py index 2904c13..95a7ade 100644 --- a/tests/test_smp_ble_transport.py +++ b/tests/test_smp_ble_transport.py @@ -65,11 +65,6 @@ def test_UUID_PATTERN() -> None: assert UUID_PATTERN.match(UUID("0000FFFF-0000-4FFF-a000-FFFFFFFFFFFF").hex) assert UUID_PATTERN.match(UUID("FFFF0000-FFFF-4000-bFFF-000000000000").hex) - assert not UUID_PATTERN.match("00000000-0000-0000-8000-000000000000") - assert not UUID_PATTERN.match("FFFFFFFF-FFFF-1FFF-9FFF-FFFFFFFFFFFF") - assert not UUID_PATTERN.match("0000FFFF-0000-4FFF-c000-FFFFFFFFFFFF") - assert not UUID_PATTERN.match("FFFF0000-FFFF-4000-dFFF-000000000000") - def test_SMP_gatt_consts() -> None: assert SMP_CHARACTERISTIC_UUID == UUID("DA2E7828-FBCE-4E01-AE9E-261174997C48")