arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-02 19:01:04 +00:00
Code Issues Releases Wiki Activity

pb2json allow extra fields to merge with

Browse Source
This commit is contained in:
slush0 2014-01-09 17:33:58 +01:00
parent 323838d41e
commit 4c55093f6a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trezorlib/protobuf_json.py
View File

@ -76,9 +76,8 @@ def json2pb(pb, js):
def pb2json(pb): def pb2json(pb, js={}):
''' convert google.protobuf.descriptor instance to JSON string ''' ''' convert google.protobuf.descriptor instance to JSON string '''
js = {}
# fields = pb.DESCRIPTOR.fields #all fields # fields = pb.DESCRIPTOR.fields #all fields
fields = pb.ListFields() # only filled (including extensions) fields = pb.ListFields() # only filled (including extensions)
for field, value in fields: for field, value in fields: