Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, clear

Victor Stinner · Victor Stinner · commit db932786afdd · 2011-05-10T00:20:35.000+02:00
the end-of-file indicator after CTRL+d.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.1?
 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 --git 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

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ my_fgets(char buf, int len, FILE fp)`
`73`	`73`	`}`
`74`	`74`	`#endif /* MS_WINDOWS */`
`75`	`75`	`if (feof(fp)) {`
	`76`	`+ clearerr(fp);`
`76`	`77`	`return -1; /* EOF */`
`77`	`78`	`}`
`78`	`79`	`#ifdef EINTR`