Skip to content

Fix return values used with a Textbox.edit callback in curses #3566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Torxed merged 1 commit into from
Jun 1, 2025
Merged

Fix return values used with a Textbox.edit callback in curses #3566

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions archinstall/tui/curses_menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def __init__(
edit_height: int,
x_start: int,
y_start: int,
process_key: Callable[[int], int | None],
process_key: Callable[[int], int],
frame: FrameProperties,
alignment: Alignment = Alignment.CENTER,
hide_input: bool = False,
Expand Down Expand Up @@ -375,7 +375,7 @@ def edit(self, default_text: str | None = None) -> None:
self._textbox = Textbox(self._edit_win)
self._main_win.refresh()

self._textbox.edit(self._process_key_cb) # type: ignore[arg-type]
self._textbox.edit(self._process_key_cb)


class Viewport(AbstractViewport):
Expand Down Expand Up @@ -606,15 +606,15 @@ def kickoff(self, win: curses.window) -> Result[str]:

return self._last_state

def _process_edit_key(self, key: int) -> int | None:
def _process_edit_key(self, key: int) -> int:
key_handles = MenuKeys.from_ord(key)

if self._help_active:
if MenuKeys.ESC in key_handles:
self._help_active = False
self.clear_help_win()
return 7
return None
return 0
Copy link
Copy Markdown
Contributor Author

@correctmost correctmost Jun 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0 and None are interchangeable because Python only checks for falsiness:

https://github.com/python/cpython/blob/a3a5b4bb232ba29875147baa3b56a5524eece353/Lib/curses/textpad.py#L186-L187


# remove standard keys from the list of key handles
key_handles = [key for key in key_handles if key != MenuKeys.STD_KEYS]
Expand All @@ -628,7 +628,7 @@ def _process_edit_key(self, key: int) -> int | None:
self._clear_all()
self._help_active = True
self._show_help()
return None
return 0
case MenuKeys.ESC:
if self._allow_skip:
self._last_state = Result(ResultType.Skip, None)
Expand Down