Skip to content

Commit 97cab5f

Browse files
Refs #23919 -- Used yield from in Paginator.
1 parent a040f55 commit 97cab5f

1 file changed

Lines changed: 7 additions & 14 deletions

File tree

django/core/paginator.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,29 +103,22 @@ def _get_elided_page_range(
103103
1, 2, …, 40, 41, 42, 43, 44, 45, 46, …, 49, 50.
104104
"""
105105
if num_pages <= (on_each_side + on_ends) * 2:
106-
for page in page_range:
107-
yield page
106+
yield from page_range
108107
return
109108

110109
if number > (1 + on_each_side + on_ends) + 1:
111-
for page in range(1, on_ends + 1):
112-
yield page
110+
yield from range(1, on_ends + 1)
113111
yield self.ELLIPSIS
114-
for page in range(number - on_each_side, number + 1):
115-
yield page
112+
yield from range(number - on_each_side, number + 1)
116113
else:
117-
for page in range(1, number + 1):
118-
yield page
114+
yield from range(1, number + 1)
119115

120116
if number < (num_pages - on_each_side - on_ends) - 1:
121-
for page in range(number + 1, number + on_each_side + 1):
122-
yield page
117+
yield from range(number + 1, number + on_each_side + 1)
123118
yield self.ELLIPSIS
124-
for page in range(num_pages - on_ends + 1, num_pages + 1):
125-
yield page
119+
yield from range(num_pages - on_ends + 1, num_pages + 1)
126120
else:
127-
for page in range(number + 1, num_pages + 1):
128-
yield page
121+
yield from range(number + 1, num_pages + 1)
129122

130123
def _get_page(self, *args, **kwargs):
131124
"""

0 commit comments

Comments
 (0)