3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

msgproto: Improve Python3 compatibility 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-06-12 10:00:26 -04:00
parent 8d8c239e47
commit 0ccf3018d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
klippy/msgproto.py
View File

@ -80,7 +80,7 @@ class PT_string:
out.extend(bytearray(v)) out.extend(bytearray(v))
def parse(self, s, pos): def parse(self, s, pos):
l = s[pos] l = s[pos]
return str(bytearray(s[pos+1:pos+l+1])), pos+l+1 return bytes(bytearray(s[pos+1:pos+l+1])), pos+l+1
class PT_progmem_buffer(PT_string): class PT_progmem_buffer(PT_string):
pass pass
class PT_buffer(PT_string): class PT_buffer(PT_string):
@ -209,7 +209,7 @@ class UnknownFormat:
name = '#unknown' name = '#unknown'
def parse(self, s, pos): def parse(self, s, pos):
msgid = s[pos] msgid = s[pos]
msg = str(bytearray(s)) msg = bytes(bytearray(s))
return {'#msgid': msgid, '#msg': msg}, len(s)-MESSAGE_TRAILER_SIZE return {'#msgid': msgid, '#msg': msg}, len(s)-MESSAGE_TRAILER_SIZE
def format_params(self, params): def format_params(self, params):
return "#unknown %s" % (repr(params['#msg']),) return "#unknown %s" % (repr(params['#msg']),)