(original) (raw)

changeset: 69994:b5914bfb4d04 branch: 3.2 parent: 69987:62e2b74c3bfc parent: 69993:fa3227c3cf87 user: Victor Stinner victor.stinner@haypocalc.com date: Tue May 10 00:20:35 2011 +0200 files: Misc/NEWS Parser/myreadline.c description: Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, clear the end-of-file indicator after CTRL+d. diff -r 62e2b74c3bfc -r b5914bfb4d04 Misc/NEWS --- a/Misc/NEWS Mon May 09 18:49:42 2011 +0200 +++ b/Misc/NEWS Tue May 10 00:20:35 2011 +0200 @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, + clear the end-of-file indicator after CTRL+d. + - Issue #1856: Avoid crashes and lockups when daemon threads run while the interpreter is shutting down; instead, these threads are now killed when they try to take the GIL. diff -r 62e2b74c3bfc -r b5914bfb4d04 Parser/myreadline.c --- a/Parser/myreadline.c Mon May 09 18:49:42 2011 +0200 +++ b/Parser/myreadline.c Tue May 10 00:20:35 2011 +0200 @@ -73,6 +73,7 @@ } #endif /* MS_WINDOWS */ if (feof(fp)) { + clearerr(fp); return -1; /* EOF */ } #ifdef EINTR /victor.stinner@haypocalc.com