projects
/
sandbox
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplified tests, added deserialization for unsigned integers
[sandbox]
/
serial
/
binary.py
diff --git
a/serial/binary.py
b/serial/binary.py
index
f6bcff7
..
c4693db
100644
(file)
--- a/
serial/binary.py
+++ b/
serial/binary.py
@@
-56,10
+56,26
@@
def _make_tag_only_parser(tag, value):
return parser
return parser
+def _make_struct_deserializer(tag, fmt):
+ fmt = '!' + fmt
+ size = struct.calcsize(fmt)
+ unpacker = functools.partial(struct.unpack, fmt)
+
+ def parser(b):
+ b = b.read(size)
+ assert len(b) == size
+ return TaggedObject(tag = tag, instance = unpacker(b)[0])
+
+ return parser
+
_TAGS_TO_PARSERS = {
TAG_NULL: _make_tag_only_parser(TAG_NULL, None),
TAG_TRUE: _make_tag_only_parser(TAG_TRUE, True),
TAG_FALSE: _make_tag_only_parser(TAG_FALSE, False),
_TAGS_TO_PARSERS = {
TAG_NULL: _make_tag_only_parser(TAG_NULL, None),
TAG_TRUE: _make_tag_only_parser(TAG_TRUE, True),
TAG_FALSE: _make_tag_only_parser(TAG_FALSE, False),
+ TAG_UINT8: _make_struct_deserializer(TAG_UINT8, 'B'),
+ TAG_UINT16: _make_struct_deserializer(TAG_UINT16, 'H'),
+ TAG_UINT32: _make_struct_deserializer(TAG_UINT32, 'I'),
+ TAG_UINT64: _make_struct_deserializer(TAG_UINT64, 'Q'),
}
def deserialize(b):
}
def deserialize(b):