Merge 5421adc into 5931d36

digidotcom · Dec 16, 2015 · 34fb5c5 · 34fb5c5
2 parents 5931d36 + 5421adc
commit 34fb5c5
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/suitcase/fields.py b/suitcase/fields.py
@@ -8,6 +8,7 @@
 import six
 from suitcase.exceptions import SuitcaseChecksumException, SuitcaseProgrammingError, \
     SuitcaseParseError, SuitcaseException, SuitcasePackStructException
+import suitcase
 from six import BytesIO, StringIO
 
 
@@ -831,6 +832,12 @@ def unpack(self, data, **kwargs):
         self._value = self.substructure()
         return self._value.unpack(data, **kwargs)
 
+    def setval(self, value):
+        if value is None or isinstance(value, suitcase.structure.Structure):
+            BaseField.setval(self, value)
+        else:
+            self._value.setval(value)
+
 
 class FieldArray(BaseField):
     """Field which contains a list of some other field.