diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-09 22:19:53 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-09 22:19:53 (GMT) |
| commit | 4755ab010f18863e305bbd17bbc16b7f39aed360 (patch) | |
| tree | ac5b61397fde63b3deb58bf2e4c7f964f2720aa6 | |
| parent | f9756c2336029d082317718cd1b2e330f48164d6 (diff) | |
| download | cpython-4755ab010f18863e305bbd17bbc16b7f39aed360.zip cpython-4755ab010f18863e305bbd17bbc16b7f39aed360.tar.gz cpython-4755ab010f18863e305bbd17bbc16b7f39aed360.tar.bz2 | |
Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c,
clear the end-of-file indicator after CTRL+d.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Parser/myreadline.c | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -10,6 +10,9 @@ What's New in Python 3.1.4? 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 --git a/Parser/myreadline.c b/Parser/myreadline.c index 7166fc1..4cc4b2c 100644 --- a/Parser/myreadline.c +++ b/Parser/myreadline.c @@ -73,6 +73,7 @@ my_fgets(char *buf, int len, FILE *fp) } #endif /* MS_WINDOWS */ if (feof(fp)) { + clearerr(fp); return -1; /* EOF */ } #ifdef EINTR |