[WIP]: Mon Dec 19 15:24:25 EST 2016

starstruct/elementcallable.py

@@ -177,9 +177,10 @@ def pack(self, msg):
     def unpack(self, msg, buf):
         """Unpack data from the supplied buffer using the initialized format."""
         ret = self._struct.unpack_from(buf)
-        if isinstance(ret, (list, tuple)):
-            # TODO: I don't know if there is a case where we want to keep
-            # it as a list... but for now I'm just going to do this
+        if isinstance(ret, (list, tuple)) and len(ret) == 1:
+            # We only change it not to a list if we expected one value.
+            # Otherwise, we keep it as a list, because that's what we would
+            # expect (like for a 16I type of struct
             ret = ret[0]
 
         # Only check for errors if they haven't told us not to

starstruct/elementnone.py

@@ -57,7 +57,7 @@ def pack(self, msg):
         return b''
 
     def unpack(self, msg, buf):
-        return (msg, buf)
+        return (None, buf)
 
     def make(self, msg):
         return msg[self.name]

starstruct/startuple.py

@@ -32,6 +32,8 @@ def StarTuple(name, named_fields, elements):
 
     named_tuple = collections.namedtuple(name, named_fields)
 
+    # TODO: Auto update and replace!
+
     def this_pack(self):
         packed = bytes()
         for _, value in self._elements.items():

starstruct/tests/test_elementnone.py

@@ -2,6 +2,7 @@
 
 """Tests for the starstruct class"""
 
+import struct
 import unittest
 from hashlib import md5
 
@@ -19,6 +20,10 @@ class TestStarStructNone(unittest.TestCase):
     def test_single_element_2(self):
         def pseudo_salted_md5(salt, original):
             temp_md5 = md5(original)
+
+            if salt is None:
+                salt = b''
+
             return md5(salt + temp_md5.digest()).digest()
 
         TestStruct = Message('TestStruct', [
@@ -29,7 +34,7 @@ def pseudo_salted_md5(salt, original):
         CRCedMessage = Message('CRCedMessage', [
             ('data', TestStruct),
             ('salted', None),
-            ('function_data', '16B', pseudo_salted_md5, ['salted', b'data']),
+            ('function_data', '16B', pseudo_salted_md5, ['salted', b'data'], False),
         ])
 
         test_data = {
@@ -52,3 +57,20 @@ def pseudo_salted_md5(salt, original):
         no_data = made.pack()
         regular = CRCedMessage.pack(**test_data)
         assert regular == no_data
+
+        # Show that there's no room to have the random salter be packed
+        len_data = len(no_data) - 16
+        assert no_data[0:len_data] == struct.pack('HBBBB', 2, 1, 2, 3, 4)
+        assert md5(
+            b'random_salter' +
+            md5(no_data[0:len_data]).digest()
+        ).digest() == no_data[len_data:]
+
+        unpacked = CRCedMessage.unpack(no_data)
+
+        assert unpacked.salted is None
+
+        # TEMP
+        new = unpacked._replace(**{'salted': b'random_salter'})
+        assert new.salted == b'random_salter'
+        # print(new._asdict())