Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #19938 -- Consumed iterator only once in paginator's Page

Thanks Joshua Fialkoff for the report.
  • Loading branch information...
commit 31f6421b134e4e83a459d2faa1009b33fefd6276 1 parent 2ee447f
@andrewjesaitis andrewjesaitis authored claudep committed
Showing with 6 additions and 1 deletion.
  1. +3 −1 django/core/paginator.py
  2. +3 −0  tests/pagination/tests.py
View
4 django/core/paginator.py
@@ -121,7 +121,9 @@ def __getitem__(self, index):
raise TypeError
# The object_list is converted to a list so that if it was a QuerySet
# it won't be a database hit per __getitem__.
- return list(self.object_list)[index]
+ if not isinstance(self.object_list, list):
+ self.object_list = list(self.object_list)
+ return self.object_list[index]
def has_next(self):
return self.number < self.paginator.num_pages
View
3  tests/pagination/tests.py
@@ -297,6 +297,7 @@ def test_page_getitem(self):
self.assertIsNone(p.object_list._result_cache)
self.assertRaises(TypeError, lambda: p['has_previous'])
self.assertIsNone(p.object_list._result_cache)
+ self.assertNotIsInstance(p.object_list, list)
# Make sure slicing the Page object with numbers and slice objects work.
self.assertEqual(p[0], Article.objects.get(headline='Article 1'))
@@ -305,3 +306,5 @@ def test_page_getitem(self):
"<Article: Article 2>",
]
)
+ # After __getitem__ is called, object_list is a list
+ self.assertIsInstance(p.object_list, list)

0 comments on commit 31f6421

Please sign in to comment.
Something went wrong with that request. Please try again.