Skip to content

Catch error from #312 #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 16, 2025
Merged

Catch error from #312 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
985d56c
Catch TypeError in validate_mac()
bouwew Aug 16, 2025
8c9a353
Start CHANGELOG update
bouwew Aug 16, 2025
5aafcbb
fixup: impr-312 Python code reformatted using Ruff
Aug 16, 2025
75bdd06
Update CHANGELOG
bouwew Aug 16, 2025
e042352
Clean up unused import
bouwew Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Ongoing

- PR [321](https://github.com/plugwise/python-plugwise-usb/pull/321): Catch error reported in Issue [#312](https://github.com/plugwise/plugwise_usb-beta/issues/312)
- PR [319](https://github.com/plugwise/python-plugwise-usb/pull/319): Replace unclear warning message when a node is not online, also various small improvements suggested by CRAI.
- PR [312](https://github.com/plugwise/python-plugwise-usb/pull/312): properly propagate configuration changes and initialize to available on first node wakeup

Expand Down
6 changes: 5 additions & 1 deletion plugwise_usb/helpers/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@

def validate_mac(mac: str) -> bool:
"""Validate the supplied string is in a MAC address format."""
if not re.match("^[A-F0-9]+$", mac):
try:
if not re.match("^[A-F0-9]+$", mac):
return False
except TypeError:
return False

try:
_ = int(mac, 16)
except ValueError:
Expand Down