summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2007-11-19 06:10:23 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2007-11-19 06:10:23 +0000
commit6522e0697a84a7628decbc86e2954b5cd430d0c0 (patch)
tree2c9b79c8ecee3d10e98e9cf6c92446cac7c24747
parent1607acee4020212166848363098008e60246e8f9 (diff)
Fixed #5932 -- Use `self.pages` and not `self._pages` in `_get_page_range` so that an exception is not raised if `self.page_range` is accessed before `self.pages`.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/paginator.py2
-rw-r--r--tests/modeltests/pagination/models.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/django/core/paginator.py b/django/core/paginator.py
index b50ca826c4..71a5479fd5 100644
--- a/django/core/paginator.py
+++ b/django/core/paginator.py
@@ -91,7 +91,7 @@ class ObjectPaginator(object):
a template for loop.
"""
if self._page_range is None:
- self._page_range = range(1, self._pages + 1)
+ self._page_range = range(1, self.pages + 1)
return self._page_range
hits = property(_get_hits)
diff --git a/tests/modeltests/pagination/models.py b/tests/modeltests/pagination/models.py
index 1dcec00a32..f44c67a139 100644
--- a/tests/modeltests/pagination/models.py
+++ b/tests/modeltests/pagination/models.py
@@ -78,7 +78,8 @@ True
>>> paginator.pages
2
-# The paginator can provide a list of all available pages
+# The paginator can provide a list of all available pages.
+>>> paginator = ObjectPaginator(Article.objects.all(), 10)
>>> paginator.page_range
[1, 2]
"""}