Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Only set rl_completion_display_matches_hook if there 

is a Python hook function. Fixes #1425.
This commit is contained in:
Martin v. Löwis 2007-11-12 04:53:02 +00:00
parent abfe45368c
commit f354894e7b
1 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Modules/readline.c
View File

@ -38,6 +38,10 @@
extern char **completion_matches(char *, rl_compentry_func_t *); extern char **completion_matches(char *, rl_compentry_func_t *);
#endif #endif
static void
on_completion_display_matches_hook(char **matches,
int num_matches, int max_length);
/* Exported function to send one line to readline's init file parser */ /* Exported function to send one line to readline's init file parser */
@ -208,8 +212,17 @@ static PyObject *pre_input_hook = NULL;
static PyObject * static PyObject *
set_completion_display_matches_hook(PyObject *self, PyObject *args) set_completion_display_matches_hook(PyObject *self, PyObject *args)
{ {
return set_hook("completion_display_matches_hook", PyObject *result = set_hook("completion_display_matches_hook",
&completion_display_matches_hook, args); &completion_display_matches_hook, args);
#ifdef HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK
/* We cannot set this hook globally, since it replaces the
default completion display. */
rl_completion_display_matches_hook =
completion_display_matches_hook ?
(rl_compdisp_func_t *)on_completion_display_matches_hook : 0;
#endif
return result;
} }
PyDoc_STRVAR(doc_set_completion_display_matches_hook, PyDoc_STRVAR(doc_set_completion_display_matches_hook,
@ -668,39 +681,37 @@ static void
on_completion_display_matches_hook(char **matches, on_completion_display_matches_hook(char **matches,
int num_matches, int max_length) int num_matches, int max_length)
{ {
if (completion_display_matches_hook != NULL) { int i;
int i; PyObject *m, *s;
PyObject *m, *s; PyObject *r;
PyObject *r;
#ifdef WITH_THREAD #ifdef WITH_THREAD
PyGILState_STATE gilstate = PyGILState_Ensure(); PyGILState_STATE gilstate = PyGILState_Ensure();
#endif
m = PyList_New(num_matches);
for (i = 0; i < num_matches; i++) {
s = PyString_FromString(matches[i+1]);
PyList_SetItem(m, i, s);
}
r = PyObject_CallFunction(completion_display_matches_hook,
"sOi", matches[0], m, max_length);
Py_DECREF(m);
if (r == NULL ||
(r != Py_None && PyInt_AsLong(r) == -1 && PyErr_Occurred())) {
goto error;
}
Py_DECREF(r);
goto done;
error:
PyErr_Clear();
Py_XDECREF(r);
done:
#ifdef WITH_THREAD
PyGILState_Release(gilstate);
#endif #endif
m = PyList_New(num_matches);
for (i = 0; i < num_matches; i++) {
s = PyString_FromString(matches[i+1]);
PyList_SetItem(m, i, s);
} }
r = PyObject_CallFunction(completion_display_matches_hook,
"sOi", matches[0], m, max_length);
Py_DECREF(m);
if (r == NULL ||
(r != Py_None && PyInt_AsLong(r) == -1 && PyErr_Occurred())) {
goto error;
}
Py_DECREF(r);
goto done;
error:
PyErr_Clear();
Py_XDECREF(r);
done:
#ifdef WITH_THREAD
PyGILState_Release(gilstate);
#endif
} }
@ -781,10 +792,6 @@ setup_readline(void)
rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap); rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
/* Set our hook functions */ /* Set our hook functions */
#ifdef HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK
rl_completion_display_matches_hook =
(rl_compdisp_func_t *)on_completion_display_matches_hook;
#endif
rl_startup_hook = (Function *)on_startup_hook; rl_startup_hook = (Function *)on_startup_hook;
#ifdef HAVE_RL_PRE_INPUT_HOOK #ifdef HAVE_RL_PRE_INPUT_HOOK
rl_pre_input_hook = (Function *)on_pre_input_hook; rl_pre_input_hook = (Function *)on_pre_input_hook;