encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-04-28 13:03:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix for python3

Browse Source
This commit is contained in:
Alexander Akhmetov 2013-08-27 17:38:41 +04:00 committed by Alexander Akhmetov
parent 316de3a8a3
commit 7fb3f078f0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/generics.py
View File

@ -212,12 +212,15 @@ class GenericAPIView(views.APIView):
except (KeyError, ValueError): except (KeyError, ValueError):
pass pass
else: else:
if self.max_paginate_by: if self.max_paginate_by is not None:
return min(self.max_paginate_by, paginate_by_param) return min(self.max_paginate_by, paginate_by_param)
else: else:
return paginate_by_param return paginate_by_param
return min(self.max_paginate_by, self.paginate_by) or self.paginate_by if self.max_paginate_by:
return min(self.max_paginate_by, self.paginate_by)
else:
return self.paginate_by
def get_serializer_class(self): def get_serializer_class(self):
""" """