summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-08-01 10:14:28 -0400
committerTim Graham <timograham@gmail.com>2014-08-01 10:14:28 -0400
commitee0208108bd66cec04b28aca76eb506d9a2e1fd3 (patch)
treedd20a1673d12037d4e85546123db8385834039ea
parente02d82155ad071639b985904289392003c5f03f1 (diff)
Revert "[1.7.x] Fixed #23088 -- Used `six` `range` type in `Paginator.page_range`."
This reverts commit ce95ab8f025cc9f35990f0c2d9a290eec1ece753. It caused some backwards compatibility concerns (refs #23140).
-rw-r--r--django/core/paginator.py2
-rw-r--r--tests/pagination/tests.py7
2 files changed, 1 insertions, 8 deletions
diff --git a/django/core/paginator.py b/django/core/paginator.py
index 75292236fa..c8b9377856 100644
--- a/django/core/paginator.py
+++ b/django/core/paginator.py
@@ -96,7 +96,7 @@ class Paginator(object):
Returns a 1-based range of pages for iterating through within
a template for loop.
"""
- return six.moves.range(1, self.num_pages + 1)
+ return range(1, self.num_pages + 1)
page_range = property(_get_page_range)
diff --git a/tests/pagination/tests.py b/tests/pagination/tests.py
index 3ff1306045..c2ad54c5ad 100644
--- a/tests/pagination/tests.py
+++ b/tests/pagination/tests.py
@@ -232,13 +232,6 @@ class PaginationTests(unittest.TestCase):
self.assertEqual(page2.previous_page_number(), 1)
self.assertIsNone(page2.next_page_number())
- def test_page_range_type(self):
- """
- Ticket #23088: Paginator.page_range is of inconsistent type in Py2/Py3
- """
- paginator = Paginator([1, 2, 3], 2)
- self.assertEqual(type(paginator.page_range), six.moves.range)
-
class ModelPaginationTests(TestCase):
"""