Ticket #7670: ticket-7670.patch

views/generic/list_detail.py

@@ -45 +45 @@
     if extra_context is None: extra_context = {}
     queryset = queryset._clone()
     if paginate_by:
-        paginator = QuerySetPaginator(queryset, paginate_by, allow_empty_first_page=allow_empty)
+        paginator = Paginator(queryset, paginate_by, allow_empty_first_page=allow_empty)
         if not page:
             page = request.GET.get('page', 1)
         try:

contrib/admin/views/main.py

@@ -611 +611 @@
         return mark_safe('?' + '&'.join([u'%s=%s' % (k, v) for k, v in p.items()]).replace(' ', '%20'))
 
     def get_results(self, request):
-        paginator = QuerySetPaginator(self.query_set, self.lookup_opts.admin.list_per_page)
+        paginator = Paginator(self.query_set, self.lookup_opts.admin.list_per_page)
 
         # Get the number of objects, with admin filters applied.
         try: