arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-06 08:59:15 +00:00
Code Issues Releases Wiki Activity

Fix handling of find_by_path in transports.

Browse Source
This commit is contained in:
slush 2018-02-06 18:40:07 +01:00
parent d45cba1ddb
commit 6a22cf481c
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
trezorlib/transport_hid.py
View File

@ -97,7 +97,7 @@ class HidTransport(Transport):
return devices return devices
@classmethod @classmethod
def find_by_path(cls, path=None): def find_by_path(cls, path):
if isinstance(path, str): if isinstance(path, str):
path = path.encode() path = path.encode()
path = path.replace(b'%s:' % cls.PATH_PREFIX.encode(), b'') path = path.replace(b'%s:' % cls.PATH_PREFIX.encode(), b'')

7
trezorlib/transport_udp.py
View File

@ -69,11 +69,8 @@ class UdpTransport(Transport):
return devices return devices
@classmethod @classmethod
def find_by_path(cls, path=None): def find_by_path(cls, path):
if isinstance(path, str): path = path.replace('%s:' % cls.PATH_PREFIX, '')
path = path.encode()
path = path.replace(b'%s:' % cls.PATH_PREFIX.encode(), b'')
return UdpTransport(path) return UdpTransport(path)
def open(self): def open(self):

2
trezorlib/transport_webusb.py
View File

@ -106,7 +106,7 @@ class WebUsbTransport(Transport):
return devices return devices
@classmethod @classmethod
def find_by_path(cls, path=None): def find_by_path(cls, path):
path = path.replace('%s:' % cls.PATH_PREFIX, '') # Remove prefix from __str__() path = path.replace('%s:' % cls.PATH_PREFIX, '') # Remove prefix from __str__()
for transport in WebUsbTransport.enumerate(): for transport in WebUsbTransport.enumerate():
if path is None or dev_to_str(transport.device) == path: if path is None or dev_to_str(transport.device) == path: