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 --git a/Misc/NEWS b/Misc/NEWS
index 2a31e1086cba7ec84ec388a68eb0a2ac4714aab4..951a136c40cecabddf1b93a677092fafb23f7635 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 7166fc1d010611fb663e25144fdb4f9f712fe7e4..4cc4b2cf6b66ef5f756ea1be2e6d3aab159f4e40 100644 (file)
--- 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