python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent endless loop with buttons (#1626)

Browse source 
* fix: prevent endless loop with buttons

* test: added test for add w/o max width

* docs: added changelog record

* chore: explicit set max_width 0
This commit is contained in:
Oleg A. 2025-02-16 23:39:51 +03:00 • committed by GitHub
parent 7b07338851
commit e17c84144d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES/1595.bugfix.rst Normal file
View file

@ -0,0 +1 @@
Fixed endless loop while adding buttons to the :code:`KeyboardBuilder`.

3
aiogram/utils/keyboard.py
View file

@ -179,9 +179,12 @@ class KeyboardBuilder(Generic[ButtonType], ABC):
last_row.extend(head) last_row.extend(head)
# Separate buttons to exclusive rows with max possible row width # Separate buttons to exclusive rows with max possible row width
if self.max_width > 0:
while buttons: while buttons:
row, buttons = buttons[: self.max_width], buttons[self.max_width :] row, buttons = buttons[: self.max_width], buttons[self.max_width :]
markup.append(list(row)) markup.append(list(row))
else:
markup.append(list(buttons))
self._markup = markup self._markup = markup
return self return self

10
tests/test_utils/test_keyboard.py
View file

@ -170,6 +170,16 @@ class TestKeyboardBuilder:
if last_columns: if last_columns:
assert len(markup[-1]) == last_columns assert len(markup[-1]) == last_columns
def test_add_wo_max_width(self):
builder = KeyboardBuilder(button_type=KeyboardButton)
builder.max_width = 0
count = 42
for index in range(count):
builder.add(KeyboardButton(text=f"btn-{index}"))
assert len(list(builder.buttons)) == count
def test_row( def test_row(
self, self,
): ):