aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/generics.py
diff options
context:
space:
mode:
authorRoss McFarland2013-10-21 14:23:06 -0700
committerRoss McFarland2013-10-21 14:23:06 -0700
commitf0a129dcda3d671b88b5049d9ddaec53a4b32faf (patch)
treec2a34fb6bc56a2655923552615005038899eb6cb /rest_framework/generics.py
parent63e6a3b4925bf54e80ae63502a0353136e846b31 (diff)
downloaddjango-rest-framework-f0a129dcda3d671b88b5049d9ddaec53a4b32faf.tar.bz2
retract the default page stuff.
better way comming in a seperate pr
Diffstat (limited to 'rest_framework/generics.py')
-rw-r--r--rest_framework/generics.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 6b42a1d5..4015ab20 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -145,15 +145,7 @@ class GenericAPIView(views.APIView):
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
- if not page:
- # we didn't recieve a page
- if hasattr(paginator, 'default_page_number'):
- # our paginator has a method that will provide a default
- page = paginator.default_page_number()
- else:
- # fall back on the base default value
- page = 1
+ page = page_kwarg or page_query_param or 1
try:
page_number = paginator.validate_number(page)
except InvalidPage: