arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-03-24 03:55:44 +00:00
Code Issues Releases Wiki Activity

skip None and empty ([]) fields in proto messages

Browse Source
This commit is contained in:
Pavol Rusnak 2018-01-07 18:07:13 +01:00
parent f587135b8d
commit 0c5eac2f39
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trezorlib/client.py
View File

@ -405,9 +405,8 @@ class DebugLinkMixin(object):
"Expected %s, got %s" % (pprint(expected), pprint(msg)))
for field, value in expected.__dict__.items():
if getattr(expected, field) is None:
if value is None or value == []:
continue
print("EXPECTED", getattr(expected, field), getattr(msg, field), field, value)
if getattr(msg, field) != value:
raise CallException(proto.FailureType.UnexpectedMessage,
"Expected %s, got %s" % (pprint(expected), pprint(msg)))

7
trezorlib/protobuf.py
View File

@ -102,7 +102,12 @@ class MessageType:
self.__dict__ == rhs.__dict__)
def __repr__(self):
return '<%s: %s>' % (self.__class__.__name__, self.__dict__)
d = {}
for key, value in self.__dict__.items():
if value is None or value == []:
continue
d[key] = value
return '<%s: %s>' % (self.__class__.__name__, d)
def __iter__(self):
return self.__dict__.__iter__()