diff --git a/src/fprime/common/models/serialize/array_type.py b/src/fprime/common/models/serialize/array_type.py index fa96fc25..de5fafd3 100644 --- a/src/fprime/common/models/serialize/array_type.py +++ b/src/fprime/common/models/serialize/array_type.py @@ -3,13 +3,10 @@ Created on May 29, 2020 @author: jishii """ -import copy - from .type_base import DictionaryType from .type_exceptions import ( ArrayLengthException, NotInitializedException, - TypeMismatchException, ) from . import serializable_type diff --git a/src/fprime/common/models/serialize/bool_type.py b/src/fprime/common/models/serialize/bool_type.py index 20eaf7a4..8e9087e7 100644 --- a/src/fprime/common/models/serialize/bool_type.py +++ b/src/fprime/common/models/serialize/bool_type.py @@ -32,7 +32,7 @@ def serialize(self): """Serialize a boolean value""" if self.val is None: raise NotInitializedException(type(self)) - return struct.pack("B", self.TRUE if self.val else self.FALSE) + return struct.pack("B", self.TRUE if self._val else self.FALSE) def deserialize(self, data, offset): """Deserialize boolean value""" diff --git a/src/fprime/common/models/serialize/numerical_types.py b/src/fprime/common/models/serialize/numerical_types.py index e3f4760c..6da2617b 100644 --- a/src/fprime/common/models/serialize/numerical_types.py +++ b/src/fprime/common/models/serialize/numerical_types.py @@ -7,7 +7,6 @@ @author mstarch """ import abc -import re import struct from .type_base import ValueType @@ -18,8 +17,6 @@ TypeRangeException, ) -# BITS_RE = re.compile(r"[IUF](\d\d?)") - class NumericalType(ValueType, abc.ABC): """Numerical types that can be serialized using struct and are of some power of 2 byte width""" @@ -42,14 +39,14 @@ def get_serialize_format(): def serialize(self): """Serializes this type using struct and the val property""" - if self.val is None: + if self._val is None: raise NotInitializedException(type(self)) - return struct.pack(self.get_serialize_format(), self.val) + return struct.pack(self.get_serialize_format(), self._val) def deserialize(self, data, offset): """Serializes this type using struct and the val property""" try: - self.val = struct.unpack_from(self.get_serialize_format(), data, offset)[0] + self._val = struct.unpack_from(self.get_serialize_format(), data, offset)[0] except struct.error as err: raise DeserializeException(str(err)) diff --git a/src/fprime/common/models/serialize/serializable_type.py b/src/fprime/common/models/serialize/serializable_type.py index 23e1c3d6..d5cb3118 100644 --- a/src/fprime/common/models/serialize/serializable_type.py +++ b/src/fprime/common/models/serialize/serializable_type.py @@ -4,8 +4,6 @@ @author: tcanham """ -import copy - from .type_base import BaseType, DictionaryType from .type_exceptions import ( MissingMemberException,