(original) (raw)

changeset: 69993:fa3227c3cf87 branch: 3.1 parent: 69983:4a3d5198a408 user: Victor Stinner victor.stinner@haypocalc.com date: Tue May 10 00:19:53 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 4a3d5198a408 -r fa3227c3cf87 Misc/NEWS --- a/Misc/NEWS Mon May 09 18:36:53 2011 +0300 +++ b/Misc/NEWS Tue May 10 00:19:53 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 #9756: When calling a method descriptor or a slot wrapper descriptor, the check of the object type doesn't read the __class__ attribute anymore. Fix a crash if a class override its __class__ attribute (e.g. a proxy of the diff -r 4a3d5198a408 -r fa3227c3cf87 Parser/myreadline.c --- a/Parser/myreadline.c Mon May 09 18:36:53 2011 +0300 +++ b/Parser/myreadline.c Tue May 10 00:19:53 2011 +0200 @@ -73,6 +73,7 @@ } #endif /* MS_WINDOWS */ if (feof(fp)) { + clearerr(fp); return -1; /* EOF */ } #ifdef EINTR /victor.stinner@haypocalc.com