Skip to content

Commit cdc179a

Browse files
authored
Merge pull request #65 from PlayerData/fix-uuid-pattern
fix: Handle Mac Sequoia UUIDs
2 parents 2877523 + efdfdc3 commit cdc179a

2 files changed

Lines changed: 1 addition & 6 deletions

File tree

smpclient/transport/ble.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def _session(self) -> GattSession:
4545

4646
MAC_ADDRESS_PATTERN: Final = re.compile(r"([0-9A-F]{2}[:]){5}[0-9A-F]{2}$", flags=re.IGNORECASE)
4747
UUID_PATTERN: Final = re.compile(
48-
r"^[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}\Z",
48+
r"^[a-f0-9]{8}-?[a-f0-9]{4}-?[a-f0-9]{4}-?[a-f0-9]{4}-?[a-f0-9]{12}\Z",
4949
flags=re.IGNORECASE,
5050
)
5151

tests/test_smp_ble_transport.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ def test_UUID_PATTERN() -> None:
6565
assert UUID_PATTERN.match(UUID("0000FFFF-0000-4FFF-a000-FFFFFFFFFFFF").hex)
6666
assert UUID_PATTERN.match(UUID("FFFF0000-FFFF-4000-bFFF-000000000000").hex)
6767

68-
assert not UUID_PATTERN.match("00000000-0000-0000-8000-000000000000")
69-
assert not UUID_PATTERN.match("FFFFFFFF-FFFF-1FFF-9FFF-FFFFFFFFFFFF")
70-
assert not UUID_PATTERN.match("0000FFFF-0000-4FFF-c000-FFFFFFFFFFFF")
71-
assert not UUID_PATTERN.match("FFFF0000-FFFF-4000-dFFF-000000000000")
72-
7368

7469
def test_SMP_gatt_consts() -> None:
7570
assert SMP_CHARACTERISTIC_UUID == UUID("DA2E7828-FBCE-4E01-AE9E-261174997C48")

0 commit comments

Comments
 (0)