Merge pull request #2700 from tomchristie/do-not-paginate-if-page-size-none

Do not paginate if PAGE_SIZE=None

1 files changed, 6 insertions, 0 deletions

diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index 5e60448d..b6be6b7c 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -388,6 +388,9 @@ class LimitOffsetPagination(BasePagination):
 
     def paginate_queryset(self, queryset, request, view=None):
         self.limit = self.get_limit(request)
+        if self.limit is None:
+            return None
+
         self.offset = self.get_offset(request)
         self.count = _get_count(queryset)
         self.request = request
@@ -491,6 +494,9 @@ class CursorPagination(BasePagination):
     template = 'rest_framework/pagination/previous_and_next.html'
 
     def paginate_queryset(self, queryset, request, view=None):
+        if self.page_size is None:
+            return None
+
         self.base_url = request.build_absolute_uri()
         self.ordering = self.get_ordering(request, queryset, view)