diff options
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 28 | 
1 files changed, 19 insertions, 9 deletions
| diff --git a/rest_framework/generics.py b/rest_framework/generics.py index cdf6ece0..61dcb84a 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -150,21 +150,31 @@ class GenericAPIView(views.APIView):          return queryset      @property -    def pager(self): -        if not hasattr(self, '_pager'): +    def paginator(self): +        """ +        The paginator instance associated with the view, or `None`. +        """ +        if not hasattr(self, '_paginator'):              if self.pagination_class is None: -                self._pager = None +                self._paginator = None              else: -                self._pager = self.pagination_class() -        return self._pager +                self._paginator = self.pagination_class() +        return self._paginator      def paginate_queryset(self, queryset): -        if self.pager is None: -            return queryset -        return self.pager.paginate_queryset(queryset, self.request, view=self) +        """ +        Return a single page of results, or `None` if pagination is disabled. +        """ +        if self.paginator is None: +            return None +        return self.paginator.paginate_queryset(queryset, self.request, view=self)      def get_paginated_response(self, data): -        return self.pager.get_paginated_response(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)  # Concrete view classes that provide method handlers | 
