Merge pull request #62 from lmignon/fix-compatiility-3.0.0

Fix compatability with version 3.0.0 of Marshmallow

Author: SVilgelm

.travis.yml

@@ -11,12 +11,12 @@ python:
 
 env:
   - MARSHMALLOW_VERSION=2.19.2
-  - MARSHMALLOW_VERSION=3.0.0rc6
+  - MARSHMALLOW_VERSION=3.0.0
 
 matrix:
   exclude:
     - python: "2.7"
-      env: MARSHMALLOW_VERSION=3.0.0rc6
+      env: MARSHMALLOW_VERSION=3.0.0
 
 install:
   - pip install marshmallow==$MARSHMALLOW_VERSION

marshmallow_objects/models.py

@@ -24,7 +24,7 @@
 
 
 @marshmallow.post_load
-def __make_object__(self, data):
+def __make_object__(self, data, **kwargs):
     return self.__model_class__(__post_load__=True, __schema__=self, **data)
 
 

tests/test_models.py

@@ -18,7 +18,7 @@ class A(marshmallow.Model):
     tag_field = marshmallow.fields.Str(load_only=True)
 
     @marshmallow.post_load
-    def set_tag_field(self, data):
+    def set_tag_field(self, data, **kwargs):
         data.tag_field = data.test_field
         return data