Merge 6d1d8ad into 32bb82e

marshmallow-code · Jun 18, 2019 · a495f4c · a495f4c
2 parents 32bb82e + 6d1d8ad
commit a495f4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/flask_rest_api/pagination.py b/flask_rest_api/pagination.py
@@ -73,7 +73,7 @@ class Meta:
         )
 
         @ma.post_load
-        def make_paginator(self, data):
+        def make_paginator(self, data, **kwargs):
             return PaginationParameters(**data)
 
     return PaginationParametersSchema

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -51,12 +51,12 @@ def reset_dump_count(cls):
         cls.dump_count = 0
 
     @post_load(pass_many=True)
-    def increment_load_count(self, data, _):
+    def increment_load_count(self, data, many, **kwargs):
         self.__class__.load_count += 1
         return data
 
     @post_dump(pass_many=True)
-    def increment_dump_count(self, data, _):
+    def increment_dump_count(self, data, many, **kwargs):
         self.__class__.dump_count += 1
         return data