encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-02 20:54:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove page_size argument.

Browse Source 
`paginate_queryset` no longer takes an optional `page_size` argument.
This commit is contained in:
Tom Christie 2014-08-29 11:38:54 +01:00
parent e5e6329a22
commit b8c8d10a18
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rest_framework/generics.py
View File

@ -111,26 +111,14 @@ class GenericAPIView(views.APIView):
context = self.get_serializer_context() context = self.get_serializer_context()
return pagination_serializer_class(instance=page, context=context) return pagination_serializer_class(instance=page, context=context)
def paginate_queryset(self, queryset, page_size=None): def paginate_queryset(self, queryset):
""" """
Paginate a queryset if required, either returning a page object, Paginate a queryset if required, either returning a page object,
or `None` if pagination is not configured for this view. or `None` if pagination is not configured for this view.
""" """
deprecated_style = False page_size = self.get_paginate_by()
if page_size is not None: if not page_size:
warnings.warn('The `page_size` parameter to `paginate_queryset()` ' return None
'is deprecated. '
'Note that the return style of this method is also '
'changed, and will simply return a page object '
'when called without a `page_size` argument.',
DeprecationWarning, stacklevel=2)
deprecated_style = True
else:
# Determine the required page size.
# If pagination is not configured, simply return None.
page_size = self.get_paginate_by()
if not page_size:
return None
paginator = self.paginator_class(queryset, page_size) paginator = self.paginator_class(queryset, page_size)
page_kwarg = self.kwargs.get(self.page_kwarg) page_kwarg = self.kwargs.get(self.page_kwarg)
@ -152,8 +140,6 @@ class GenericAPIView(views.APIView):
'message': str(exc) 'message': str(exc)
}) })
if deprecated_style:
return (paginator, page, page.object_list, page.has_other_pages())
return page return page
def filter_queryset(self, queryset): def filter_queryset(self, queryset):