diff options
| author | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2026-02-27 18:49:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-27 12:49:27 -0500 |
| commit | 97cab5fe6526ca175ae520711c61a25c4f8cbb11 (patch) | |
| tree | 8ab24b4fb6db33d46a41b206b64c0435387a37d0 | |
| parent | a040f555069971192220122555f187530d679d53 (diff) | |
Refs #23919 -- Used yield from in Paginator.
| -rw-r--r-- | django/core/paginator.py | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/django/core/paginator.py b/django/core/paginator.py index d1842d6adb..17a30a00f6 100644 --- a/django/core/paginator.py +++ b/django/core/paginator.py @@ -103,29 +103,22 @@ class BasePaginator: 1, 2, …, 40, 41, 42, 43, 44, 45, 46, …, 49, 50. """ if num_pages <= (on_each_side + on_ends) * 2: - for page in page_range: - yield page + yield from page_range return if number > (1 + on_each_side + on_ends) + 1: - for page in range(1, on_ends + 1): - yield page + yield from range(1, on_ends + 1) yield self.ELLIPSIS - for page in range(number - on_each_side, number + 1): - yield page + yield from range(number - on_each_side, number + 1) else: - for page in range(1, number + 1): - yield page + yield from range(1, number + 1) if number < (num_pages - on_each_side - on_ends) - 1: - for page in range(number + 1, number + on_each_side + 1): - yield page + yield from range(number + 1, number + on_each_side + 1) yield self.ELLIPSIS - for page in range(num_pages - on_ends + 1, num_pages + 1): - yield page + yield from range(num_pages - on_ends + 1, num_pages + 1) else: - for page in range(number + 1, num_pages + 1): - yield page + yield from range(number + 1, num_pages + 1) def _get_page(self, *args, **kwargs): """ |
