pb2json allow extra fields to merge with

11 years ago · 4c55093f6a
parent 323838d41e
commit 4c55093f6a
1 changed files with 1 additions and 2 deletions
--- a/trezorlib/protobuf_json.py
+++ b/trezorlib/protobuf_json.py
@ -76,9 +76,8 @@ def json2pb(pb, js):



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