Skip to content

Commit d0e231f

Browse files
committed
Don't load HID/WebUSB if they're not available
1 parent c278627 commit d0e231f

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

tests/config.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,22 @@
2424
sys.path = ['../',] + sys.path
2525

2626
from keepkeylib.transport_pipe import PipeTransport
27-
from keepkeylib.transport_hid import HidTransport
2827
from keepkeylib.transport_socket import SocketTransportClient
29-
from keepkeylib.transport_webusb import WebUsbTransport
3028
from keepkeylib.transport_udp import UDPTransport
3129

32-
hid_devices = HidTransport.enumerate()
33-
webusb_devices = WebUsbTransport.enumerate()
30+
try:
31+
from keepkeylib.transport_hid import HidTransport
32+
hid_devices = HidTransport.enumerate()
33+
except Exception:
34+
print("Error loading HID. HID devices not enumerated.")
35+
hid_devices = []
36+
37+
try:
38+
from keepkeylib.transport_webusb import WebUsbTransport
39+
webusb_devices = WebUsbTransport.enumerate()
40+
except Exception:
41+
print("Error loading WebUSB. WebUSB devices not enumerated.")
42+
webusb_devices = []
3443

3544
reload(sys)
3645
sys.setdefaultencoding('utf8')

0 commit comments

Comments
 (0)