diff options
| author | Tom Christie | 2013-08-21 21:31:59 +0100 | 
|---|---|---|
| committer | Tom Christie | 2013-08-21 21:31:59 +0100 | 
| commit | 16ffdedd14ed842eb019414566705d8b8392ea63 (patch) | |
| tree | cd6fe551725d60b86a57ea5812f60f054e7c1f17 /rest_framework/generics.py | |
| parent | 44ceef841543877a700c3fb4a0f84dfecbad0cbb (diff) | |
| parent | 2bcad32dcb57ae9419f6a901e081f0dcdc1a6f87 (diff) | |
| download | django-rest-framework-16ffdedd14ed842eb019414566705d8b8392ea63.tar.bz2 | |
Merge master
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/rest_framework/generics.py b/rest_framework/generics.py index bcd62bf9..8e6b8e26 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -144,7 +144,7 @@ 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 = int(page) +            page_number = strict_positive_int(page)          except ValueError:              if page == 'last':                  page_number = paginator.num_pages | 
