From e5e1bd1ad96810e5e43fd51988fdfa75f76a9190 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 21 Apr 2014 12:54:53 +0200 Subject: [PATCH] Use new parse_page_number method in paginate_queryset. Additionally remove duplicate page number validation. --- rest_framework/generics.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 12651be9d..a2d59985d 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -167,16 +167,11 @@ class GenericAPIView(views.APIView): paginator = self.paginator_class(queryset, page_size, allow_empty_first_page=self.allow_empty) - page_kwarg = self.kwargs.get(self.page_kwarg) - page_query_param = self.request.QUERY_PARAMS.get(self.page_kwarg) - page = page_kwarg or page_query_param or 1 - try: - page_number = paginator.validate_number(page) - except InvalidPage: - if page == 'last': - page_number = paginator.num_pages - else: - raise Http404(_("Page is not 'last', nor can it be converted to an int.")) + + page_number = self.parse_page_number() + if page_number == -1: + page_number = paginator.num_pages + try: page = paginator.page(page_number) except InvalidPage as e: