More pagination tests & cleanup

1 files changed, 11 insertions, 1 deletions

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 4cc4c64d..61dcb84a 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -151,6 +151,9 @@ class GenericAPIView(views.APIView):
 
     @property
     def paginator(self):
+        """
+        The paginator instance associated with the view, or `None`.
+        """
         if not hasattr(self, '_paginator'):
             if self.pagination_class is None:
                 self._paginator = None
@@ -159,11 +162,18 @@ class GenericAPIView(views.APIView):
         return self._paginator
 
     def paginate_queryset(self, queryset):
+        """
+        Return a single page of results, or `None` if pagination is disabled.
+        """
         if self.paginator is None:
-            return queryset
+            return None
         return self.paginator.paginate_queryset(queryset, self.request, view=self)
 
     def get_paginated_response(self, data):
+        """
+        Return a paginated style `Response` object for the given output data.
+        """
+        assert self.paginator is not None
         return self.paginator.get_paginated_response(data)