diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-07-08 05:29:23 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-07-08 05:29:23 +0000 |
| commit | 409ed9468fad37a43e453fa1b93ba9e3893a1371 (patch) | |
| tree | 46c31832a20120deebd6f2369b6025d6736eeecb | |
| parent | a616b9217408d57650fbb5a3d9e211d9a7f8ac6d (diff) | |
Fixed #7670 -- Fixed a couple of missed changes from [7865]. Patch from jshaffer.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/views/main.py | 2 | ||||
| -rw-r--r-- | django/views/generic/list_detail.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index c2abffe492..f1f620ed9e 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -611,7 +611,7 @@ class ChangeList(object): 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: diff --git a/django/views/generic/list_detail.py b/django/views/generic/list_detail.py index 0ad1a2d086..27e36bd960 100644 --- a/django/views/generic/list_detail.py +++ b/django/views/generic/list_detail.py @@ -45,7 +45,7 @@ def object_list(request, queryset, paginate_by=None, page=None, 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: |