refactor: change usage of LppData.size to len(LppData)

cayennelpp/lpp_data.py

@@ -32,6 +32,10 @@ def __bytes__(self):
         buf = hdr_buf + dat_buf
         return bytes(buf)
 
+    def __len__(self):
+        """Return the length of the LppData byte string representation."""
+        return self.type.size + 2
+
     def __str__(self):
         """Return a pretty string representation of the LppData object."""
         return 'LppData(channel = {}, type = {}, value = {})'.format(
@@ -50,8 +54,3 @@ def from_bytes(class_object, buf):
             raise BufferError("Buffer too small!")
         value = lpp_type.decode(buf[2:(2 + size)])
         return class_object(chn, type_, value)
-
-    @property
-    def size(self):
-        """Return the length of the LppData byte string representation."""
-        return self.type.size + 2

cayennelpp/lpp_frame.py

@@ -53,15 +53,15 @@ def from_bytes(cls, buf):
         while i < len(buf):
             lppdata = LppData.from_bytes(buf[i:])
             data.append(lppdata)
-            i = i + lppdata.size
+            i = i + len(lppdata)
         return cls(data)
 
     def __add_data_item(self, item):
         """Helper function to add an LppData item to this LppFrame."""
         if not isinstance(item, LppData):
             raise TypeError()
         if self.maxsize > 0:
-            if self.size + item.size > self.maxsize:
+            if self.size + len(item) > self.maxsize:
                 raise BufferError()
         self._data.append(item)
 
@@ -93,7 +93,7 @@ def size(self):
         """Return the length of the LppFrame byte string representation."""
         size = 0
         for d in self._data:
-            size += d.size
+            size += len(d)
         return size
 
     def get_by_type(self, type_):

cayennelpp/tests/test_lpp_data.py

@@ -91,7 +91,7 @@ def test_gps_from_bytes_invalid_size():
 
 
 def test_lpp_data_size():
-    assert LppData(0, 0, 0).size == 3
+    assert len(LppData(0, 0, 0)) == 3
 
 
 def test_lpp_data_str():