diff -ru tmp/Python-2.5c1/Modules/readline.c Python-2.5c1/Modules/readline.c
--- tmp/Python-2.5c1/Modules/readline.c	2006-07-16 03:15:27.000000000 +0100
+++ Python-2.5c1/Modules/readline.c	2006-09-05 15:10:05.000000000 +0100
@@ -768,10 +768,12 @@
 
 		while (!has_input)
 		{	struct timeval timeout = {0, 100000}; /* 0.1 seconds */
+		 	struct timeval * timeoutp = NULL;
+			if(PyOS_InputHook) timeoutp = &timeout;
 			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);
+					   NULL, NULL, timeoutp);
 			if(PyOS_InputHook) PyOS_InputHook();
 		}