Merge pull request #342 from tsauerwein/sequence-null

Convert None to null before calling deserialize

cornice/schemas.py

@@ -143,6 +143,8 @@ def _validate_fields(location, data):
                             serialized = original.getall(attr.name)
                         else:
                             serialized = data[attr.name]
+                        if serialized is None:
+                            serialized = null
                         deserialized = attr.deserialize(serialized)
                 except Invalid as e:
                     # the struct is invalid

cornice/tests/test_schemas.py

@@ -55,6 +55,10 @@ class WrongSchema(SequenceSchema):
     class InheritedSchema(TestingSchema):
         foo = SchemaNode(Int(), missing=1)
 
+    class TestNoneSchema(MappingSchema):
+        foo = SchemaNode(String())
+        bar = SchemaNode(Sequence(), SchemaNode(String()), missing=None)
+
     class ToBoundSchema(TestingSchema):
         foo = SchemaNode(Int(), missing=1)
         bazinga = SchemaNode(String(), type='str', location="body",
@@ -233,6 +237,15 @@ def test_imperative_colander_schema(self):
             dummy_request = get_mock_request('{"bar": "some data"}')
             validate_colander_schema(schema, dummy_request)
 
+        def test_sequence_with_null(self):
+            # null can be passed to a sequence field
+            schema = CorniceSchema.from_colander(TestNoneSchema)
+
+            dummy_request = get_mock_request('{"foo": "abc", "bar": null}')
+            validate_colander_schema(schema, dummy_request)
+            self.assertEqual(len(dummy_request.errors), 0)
+            self.assertIsNone(dummy_request.validated['bar'])
+
         def test_colander_schema_using_drop(self):
             """
             remove fields from validated data if they deserialize to colander's