diff options
| author | Tom Christie | 2013-10-22 02:19:36 -0700 |
|---|---|---|
| committer | Tom Christie | 2013-10-22 02:19:36 -0700 |
| commit | f2648fefff548166f64b528fe2b14dbb9dd26299 (patch) | |
| tree | 3d26e0f94add0dab69fa8c14c7238455cbc9a795 /rest_framework/generics.py | |
| parent | 216ac8a5c1ba39bf24e4e91b6fac7e0ac1dee7e4 (diff) | |
| parent | c36122a7ba2cdc69f94f5732f26428329be54200 (diff) | |
| download | django-rest-framework-f2648fefff548166f64b528fe2b14dbb9dd26299.tar.bz2 | |
Merge pull request #1187 from ross/paginator_def_val
paginator should validate page and provide default
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py index f46dea76..6d204cf5 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -148,8 +148,8 @@ class GenericAPIView(views.APIView): page_query_param = self.request.QUERY_PARAMS.get(self.page_kwarg) page = page_kwarg or page_query_param or 1 try: - page_number = strict_positive_int(page) - except ValueError: + page_number = paginator.validate_number(page) + except InvalidPage: if page == 'last': page_number = paginator.num_pages else: |