diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2014-08-03 21:08:24 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2014-08-03 21:08:24 +0200 |
| commit | 40fb6a560139150daa8f231f65b4044d45a97a8d (patch) | |
| tree | 2d06373cdadb74f0bc2751d63847172a01e0c1e0 | |
| parent | 6e77acc589aaf4d95bb1665fe9526a7bc1e24a7c (diff) | |
Revert "Fixed #23088 -- Used `six` `range` type in `Paginator.page_range`."
This reverts commit 6508db2ff9fc5be95fec903b3fa7ab8204fe316a.
Refs #23088.
| -rw-r--r-- | django/core/paginator.py | 2 | ||||
| -rw-r--r-- | tests/pagination/tests.py | 7 |
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): """ |
