This is Michiel de Hoon's patch, as attached to the bug report:

[ 1030629 ] PyOS_InputHook broken

with a couple of utterly inconsequential changes by me.

diff --git a/Modules/readline.c b/Modules/readline.c
index a62244dda4e1e3c1c527aa6a923334f3466718cc..3377c8eae484f7cb0ab5d1d6c499b64810961fe9 100644 (file)
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -11,6 +11,7 @@
 #include <setjmp.h>
 #include <signal.h>
 #include <errno.h>
+#include <sys/time.h>
 
 #if defined(HAVE_SETLOCALE)
 /* GNU readline() mistakenly sets the LC_CTYPE locale.
@@ -749,15 +750,21 @@ readline_until_enter_or_signal(char *prompt, int *signal)
 
        rl_callback_handler_install (prompt, rlhandler);
        FD_ZERO(&selectset);
-       FD_SET(fileno(rl_instream), &selectset);
        
        completed_input_string = not_done_reading;
 
-       while(completed_input_string == not_done_reading) {
-               int has_input;
+       while (completed_input_string == not_done_reading) {
+               int has_input = 0;
+
+               while (!has_input)
+               {       struct timeval timeout = {0, 100000}; /* 0.1 seconds */
+                       FD_SET(fileno(rl_instream), &selectset);
+                       /* select resets selectset if no input was available */
+                       has_input = select(fileno(rl_instream) + 1, &selectset,
+                                          NULL, NULL, &timeout);
+                       if(PyOS_InputHook) PyOS_InputHook();
+               }
 
-               has_input = select(fileno(rl_instream) + 1, &selectset,
-                                  NULL, NULL, NULL);
                if(has_input > 0) {
                        rl_callback_read_char();
                }
@@ -812,6 +819,7 @@ readline_until_enter_or_signal(char *prompt, int *signal)
                *signal = 1;
                return NULL;
        }
+       rl_event_hook = PyOS_InputHook;
        p = readline(prompt);
        PyOS_setsig(SIGINT, old_inthandler);
 
@@ -834,8 +842,6 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
        setlocale(LC_CTYPE, "");
 #endif
 
-       rl_event_hook = PyOS_InputHook;
-
        if (sys_stdin != rl_instream || sys_stdout != rl_outstream) {
                rl_instream = sys_stdin;
                rl_outstream = sys_stdout;