Merge pull request #495 from ergo/master

Fix #492 - Make cornice compatible with Marshmallow 2.x and 3.x again

cornice/validators/_marshmallow.py

@@ -38,6 +38,10 @@ def _validator(request, schema=None, deserializer=None, **kwargs):
             :func:`cornice.validators.extract_cstruct`
         """
         import marshmallow
+        try:
+            from marshmallow.utils import EXCLUDE
+        except ImportError:
+            EXCLUDE = 'exclude'
 
         if schema is None:
             return
@@ -61,6 +65,7 @@ def _deserialize(self, value, attr, data):
         class Meta(object):
             strict = True
             ordered = True
+            unknown = EXCLUDE
 
         class RequestSchemaMeta(type):
             """
@@ -112,6 +117,13 @@ def _message_normalizer(exc, no_field_name="_schema"):
     :return:
     """
     if isinstance(exc.messages, dict):
+        if '_schema' in exc.messages:
+            new_dict = {}
+            # if not dict expect a list of dicts and normalize it to just dict
+            if not hasattr(exc.messages['_schema'], 'keys'):
+                for item in exc.messages['_schema']:
+                    new_dict.update(item)
+                return {'_schema': new_dict}
         return exc.messages
     if len(exc.field_names) == 0:
         return {no_field_name: exc.messages}

tests/test_validation.py

@@ -618,7 +618,7 @@ def test_validated_querystring_and_schema_from_same_schema(self):
         response = app.post_json('/m_newsletter?ref=2', params=content,
                                  status=400)
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(response.json['errors'][0]['description'][0]['email'],
+        self.assertEqual(response.json['errors'][0]['description'],
                          'Invalid email length')
 
     def test_validated_path_content_from_schema(self):

tests/validationapp.py

@@ -305,6 +305,10 @@ def item(request):
 
 try:
     import marshmallow
+    try:
+        from marshmallow.utils import EXCLUDE
+    except ImportError:
+        EXCLUDE = 'exclude'
     from cornice.validators import (
         marshmallow_validator,
         marshmallow_body_validator
@@ -327,9 +331,15 @@ def item(request):
 
 
     class MSignupSchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         username = marshmallow.fields.String()
 
     class MSignupGroupSchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         username = marshmallow.fields.String()
 
         def __init__(self, *args, **kwargs):
@@ -339,6 +349,9 @@ def __init__(self, *args, **kwargs):
     import random
 
     class MNeedsContextSchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         somefield = marshmallow.fields.Float(missing=lambda: random.random())
         csrf_secret = marshmallow.fields.String()
 
@@ -368,6 +381,9 @@ def m_validate_bar(node, value):
             raise Invalid(node, "The bar is not open.")
 
     class MBodySchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         # foo and bar are required, baz is optional
         foo = marshmallow.fields.String()
         bar = SchemaNode(String(), validator=m_validate_bar)
@@ -377,9 +393,15 @@ class MBodySchema(marshmallow.Schema):
         integers = marshmallow.fields.List(marshmallow.fields.Integer())
 
     class MQuery(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         yeah = marshmallow.fields.String()
 
     class MRequestSchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         body = marshmallow.fields.Nested(MBodySchema)
         querystring = marshmallow.fields.Nested(MQuery)
 
@@ -398,6 +420,10 @@ def normalize_field(self, data):
             return data
 
     class MQSSchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
+
         querystring = marshmallow.fields.Nested(MListQuerystringSequenced)
 
 
@@ -406,12 +432,21 @@ def m_foobaz_get(request):
         return {"field": request.validated['querystring']['field']}
 
     class MNewsletterSchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         email = marshmallow.fields.String(validate=marshmallow.validate.Email())
 
     class MRefererSchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         ref = marshmallow.fields.Integer()
 
     class MNewsletterPayload(marshmallow.Schema):
+        class Meta:
+            unknown = EXCLUDE
+
         body = marshmallow.fields.Nested(MNewsletterSchema)
         querystring = marshmallow.fields.Nested(MRefererSchema)
 
@@ -429,9 +464,15 @@ def m_newsletter(request):
         return request.validated
 
     class MItemPathSchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         item_id = marshmallow.fields.Integer(missing=None)
 
     class MItemSchema(marshmallow.Schema):
+        class Meta:
+            strict = True
+            unknown = EXCLUDE
         path = marshmallow.fields.Nested(MItemPathSchema)