Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Formatting and organization for ByteStringSplitter.

pull/157/head
jMyles 2018-02-11 01:02:45 -08:00
parent 9cd7bc083c
commit 505c3a7115
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nkms/crypto/utils.py
View File

@ -11,24 +11,26 @@ class BytestringSplitter(object):
def __call__(self, splittable, return_remainder=False, msgpack_remainder=False):
if not any((return_remainder, msgpack_remainder)) and len(self) != len(splittable):
raise ValueError(
"Wrong number of bytes to constitute message types {} - need {}, got {} \n Did you mean to return the remainder?".format(
""""Wrong number of bytes to constitute message types {} -
need {}, got {} \n Did you mean to return the remainder?""".format(
self.message_types, len(self), len(splittable)))
if len(self) > len(splittable):
raise ValueError(
"Not enough bytes to constitute message types {} - need {}, got {}".format(self.message_types,
len(self),
len(splittable)))
"""Not enough bytes to constitute
message types {} - need {}, got {}""".format(self.message_types,
len(self),
len(splittable)))
cursor = 0
message_objects = []
for message_type in self.message_types:
message_class, message_length = self.get_message_meta(message_type)
message_class, message_length, kwargs = self.get_message_meta(message_type)
expected_end_of_object_bytes = cursor + message_length
bytes_for_this_object = splittable[cursor:expected_end_of_object_bytes]
try:
message = message_class.from_bytes(bytes_for_this_object)
message = message_class.from_bytes(bytes_for_this_object, **kwargs)
except AttributeError:
message = message_class(bytes_for_this_object)
message = message_class(bytes_for_this_object, **kwargs)
message_objects.append(message)
cursor = expected_end_of_object_bytes