encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-23 01:57:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

If page size query param <= 0, just use default page size.

Browse Source 
Closes #1028
This commit is contained in:
Tom Christie 2013-08-21 21:18:46 +01:00
parent db25aaff3a
commit 815ef50735
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rest_framework/generics.py
View File

@ -14,6 +14,15 @@ from rest_framework.settings import api_settings
import warnings import warnings
def strict_positive_int(integer_string):
"""
Cast a string to a strictly positive integer.
"""
ret = int(integer_string)
if ret <= 0:
raise ValueError()
return ret
def get_object_or_404(queryset, **filter_kwargs): def get_object_or_404(queryset, **filter_kwargs):
""" """
Same as Django's standard shortcut, but make sure to raise 404 Same as Django's standard shortcut, but make sure to raise 404
@ -198,7 +207,7 @@ class GenericAPIView(views.APIView):
if self.paginate_by_param: if self.paginate_by_param:
query_params = self.request.QUERY_PARAMS query_params = self.request.QUERY_PARAMS
try: try:
return int(query_params[self.paginate_by_param]) return strict_positive_int(query_params[self.paginate_by_param])
except (KeyError, ValueError): except (KeyError, ValueError):
pass pass