Skip to content

gh-112292 : Catch import error conditions with readline hooks #112313

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
ericsnowcurrently merged 19 commits into from
Nov 28, 2023
Merged

gh-112292 : Catch import error conditions with readline hooks #112313

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e8d2115
Catch import error conditions with readline callback hook on_startup_…
tonybaloney Nov 22, 2023
d56fb47
Add news entry
tonybaloney Nov 22, 2023
6e9e66d
Move the GIL release to after setting an error
tonybaloney Nov 22, 2023
364d8d5
remove else
tonybaloney Nov 22, 2023
4ddf510
Merge branch 'robust_readline_hook' of github.com:tonybaloney/cpython…
tonybaloney Nov 22, 2023
8890f5c
Harden the on_pre_input_hook
tonybaloney Nov 22, 2023
f4580c8
Replace uses of a global macro with no error checking with a function…
tonybaloney Nov 23, 2023
b408004
Don't set exceptions on non-Python calls.
tonybaloney Nov 23, 2023
30a1a73
Acquire GIL before checking module state since it will require tstate…
tonybaloney Nov 23, 2023
64cfda5
Merge remote-tracking branch 'origin/main' into robust_readline_hook
tonybaloney Nov 25, 2023
451513b
Update Modules/readline.c
tonybaloney Nov 27, 2023
59239f0
Update Modules/readline.c
tonybaloney Nov 27, 2023
cf72dc4
Apply suggestions from code review
tonybaloney Nov 27, 2023
aa75a62
Update Modules/readline.c
tonybaloney Nov 28, 2023
30c79d7
fixup variable name
tonybaloney Nov 28, 2023
ae57bed
Merge branch 'robust_readline_hook' of github.com:tonybaloney/cpython…
tonybaloney Nov 28, 2023
b1fa25b
Use simpler assertion
tonybaloney Nov 28, 2023
ff038f0
Simpler hook check
tonybaloney Nov 28, 2023
43d609d
Don't assert error check
tonybaloney Nov 28, 2023
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
Prev Previous commit
Next Next commit
Simpler hook check
  • Loading branch information
@tonybaloney
tonybaloney committed Nov 28, 2023
commit ff038f02379bc99755b74d6b9895d6f8f8a990ec
23 changes: 3 additions & 20 deletions Modules/readline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,6 @@ readline_clear(PyObject *m)
return 0;
}

/* This undoes any readline configuration done in setup_readline(). */
static void
readline_cleanup(void)
{
rl_startup_hook = NULL;
#ifdef HAVE_RL_PRE_INPUT_HOOK
rl_pre_input_hook = NULL;
#endif
rl_attempted_completion_function = NULL;
}

static int
readline_traverse(PyObject *m, visitproc visit, void *arg)
{
Expand Down Expand Up @@ -1079,18 +1068,12 @@ on_pre_input_hook(void)
{
int r;
PyGILState_STATE gilstate = PyGILState_Ensure();
PyObject* mod = PyState_FindModule(&readlinemodule);
if (mod == NULL) {
if (!PyErr_Occurred()) {
PyErr_SetString(PyExc_ImportError, "readline import initialization failure during startup hook");
}
readline_cleanup();
readlinestate *state = get_hook_module_state();
if (state == NULL) {
PyGILState_Release(gilstate);
return -1;
}
Py_INCREF(mod);
r = on_hook(get_readline_state(mod)->pre_input_hook);
Py_DECREF(mod);
r = on_hook(state->pre_input_hook);
PyGILState_Release(gilstate);
return r;
}
Expand Down