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

add __repr__ to Message and MessageType

Browse Source
This commit is contained in:
Jan Pochyla 2016-06-09 16:26:00 +02:00 committed by Pavol Rusnak
parent 1da27dd558
commit 173c49bef8
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/protobuf/protobuf.py
View File

@ -99,12 +99,13 @@ _unpack_key = lambda key: (key >> 3, key & 7)
class MessageType: class MessageType:
# Represents a message type. # Represents a message type.
def __init__(self): def __init__(self, name=None):
# Creates a new message type. # Creates a new message type.
self.__tags_to_types = dict() # Maps a tag to a type instance. self.__tags_to_types = dict() # Maps a tag to a type instance.
self.__tags_to_names = dict() # Maps a tag to a given field name. self.__tags_to_names = dict() # Maps a tag to a given field name.
self.__defaults = dict() # Maps a tag to its default value. self.__defaults = dict() # Maps a tag to its default value.
self.__flags = dict() # Maps a tag to FLAG_ self.__flags = dict() # Maps a tag to FLAG_
self.__name = name
def add_field(self, tag, name, field_type, flags=FLAG_SIMPLE, default=None): def add_field(self, tag, name, field_type, flags=FLAG_SIMPLE, default=None):
# Adds a field to the message type. # Adds a field to the message type.
@ -194,6 +195,9 @@ class MessageType:
fp = BytesIO(buf) fp = BytesIO(buf)
return self.load(fp) return self.load(fp)
def __repr__(self):
return '<MessageType: %s>' % self.__name
class Message: class Message:
# Represents a message instance. # Represents a message instance.
@ -213,6 +217,11 @@ class Message:
# Dumps the message into bytes # Dumps the message into bytes
return self.message_type.dumps(self) return self.message_type.dumps(self)
def __repr__(self):
values = self.__dict__
values = {k:values[k] for k in values if k != 'message_type'}
return '<%s: %s>' % (self.message_type.__name, values)
# Embedded message. ------------------------------------------------------------ # Embedded message. ------------------------------------------------------------
class EmbeddedMessage: class EmbeddedMessage:

2
tools/pb2py
View File

@ -8,7 +8,7 @@ from google.protobuf.internal.enum_type_wrapper import EnumTypeWrapper
def process_type(t, cls, msg_id): def process_type(t, cls, msg_id):
imports = ["from protobuf import protobuf as p",] imports = ["from protobuf import protobuf as p",]
out = ["t = p.MessageType()", ] out = ["t = p.MessageType('%s')" % t, ]
if msg_id is not None: if msg_id is not None:
out.append("t.wire_type = %d" % msg_id) out.append("t.wire_type = %d" % msg_id)