Merge pull request #236 from kevinjqiu/compound-object-set-to-none

Set `None` on a field that's a compound type should honour that semantics

schematics/models.py

@@ -63,7 +63,10 @@ def __set__(self, instance, value):
         """
         from .types.compound import ModelType
         field = instance._fields[self.name]
-        if not isinstance(value, Model) and isinstance(field, ModelType):
+        if all((
+                value is not None,
+                not isinstance(value, Model),
+                isinstance(field, ModelType))):
             value = field.model_class(value)
         instance._data[self.name] = value
 

tests/test_model_type.py

@@ -45,6 +45,21 @@ class Player(Model):
     assert p.location is None
 
 
+def test_simple_embedded_model_set_to_none():
+    class Location(Model):
+        country_code = StringType()
+
+    class Player(Model):
+        id = IntType()
+        location = ModelType(Location)
+
+    p = Player(dict(id=1))
+    p.location = None
+
+    assert p.id == 1
+    assert p.location is None
+
+
 def test_simple_embedded_model_is_none_within_listtype():
     class QuestionResources(Model):
         type = StringType()