arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 17:38:39 +00:00
Code Issues Releases Wiki Activity

protobuf text_format now prints in both binary and hex form

Browse Source
This commit is contained in:
slush0 2014-02-01 11:57:59 +01:00
parent 2782655320
commit eb22fad568
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trezorlib/tools.py
View File

@ -90,9 +90,8 @@ def monkeypatch_google_protobuf_text_format():
def _customPrintFieldValue(field, value, out, indent=0, as_utf8=False, as_one_line=False): def _customPrintFieldValue(field, value, out, indent=0, as_utf8=False, as_one_line=False):
if field.cpp_type == google.protobuf.descriptor.FieldDescriptor.CPPTYPE_STRING and \ if field.cpp_type == google.protobuf.descriptor.FieldDescriptor.CPPTYPE_STRING and \
str(field.GetOptions()).strip() == '[binary]:': # binary option set '[binary]:' in str(field.GetOptions()).strip(): # binary option set
_oldPrintFieldValue(field, 'hex(%s) str(%s)' % (binascii.hexlify(value), value), out, indent, as_utf8, as_one_line) _oldPrintFieldValue(field, 'hex(%s) | str(%s)' % (binascii.hexlify(value), value), out, indent, as_utf8, as_one_line)
else: else:
_oldPrintFieldValue(field, value, out, indent, as_utf8, as_one_line) _oldPrintFieldValue(field, value, out, indent, as_utf8, as_one_line)