Skip to content

Commit fea513b

Browse files
committed
Fix pagination header error with marshmallow 2
1 parent dbd7a6e commit fea513b

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

flask_smorest/pagination.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,10 @@ def _make_pagination_header(page, page_size, item_count):
260260
page_header['previous_page'] = page - 1
261261
if page < last_page:
262262
page_header['next_page'] = page + 1
263-
return PaginationHeaderSchema().dumps(page_header)
263+
header = PaginationHeaderSchema().dumps(page_header)
264+
if MARSHMALLOW_VERSION_MAJOR < 3:
265+
header = header.data
266+
return header
264267

265268
@staticmethod
266269
def _prepare_pagination_doc(doc, doc_info, **kwargs):

tests/test_pagination.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ def func(pagination_parameters):
146146
'{"total": 2, "total_pages": 1, '
147147
'"first_page": 1, "last_page": 1, "page": 1}'
148148
)
149+
# Also check there is only one pagination header
150+
assert len(response.headers.getlist(header_name)) == 1
149151

150152
def test_pagination_header_documentation(self, app):
151153
"""Test pagination header is documented"""

0 commit comments

Comments
 (0)