From c567ceec94d0e4cd82f48978a1e2cb27e842a87e Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Thu, 5 May 2016 20:48:10 +0300 Subject: [PATCH] transport_hid: fix buffer handling for Python 3 --- trezorlib/transport_hid.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/trezorlib/transport_hid.py b/trezorlib/transport_hid.py index bdaf5cb..c6ac67a 100644 --- a/trezorlib/transport_hid.py +++ b/trezorlib/transport_hid.py @@ -65,7 +65,7 @@ class HidTransport(Transport): return False def _open(self): - self.buffer = '' + self.buffer = bytearray() self.hid = hid.device() self.hid.open_path(self.device) self.hid.set_nonblocking(True) @@ -75,7 +75,7 @@ class HidTransport(Transport): def _close(self): self.hid.close() - self.buffer = '' + self.buffer = bytearray() self.hid = None def ready_to_read(self): @@ -116,8 +116,8 @@ class HidTransport(Transport): raise Exception("Not implemented") # Payload received, skip the report ID - self.buffer += str(bytearray(data[1:])) + self.buffer.extend(bytearray(data[1:])) ret = self.buffer[:length] self.buffer = self.buffer[length:] - return ret + return bytes(ret)