traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Merge 3.2) Issue #1195: Fix input() if it is interrupted by CTRL+d and then 

CTRL+c, clear the end-of-file indicator after CTRL+d.
This commit is contained in:
Victor Stinner 2011-05-10 00:21:26 +02:00
parent f223116001 db932786af
commit 00c5925533
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins 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 - Issue #1856: Avoid crashes and lockups when daemon threads run while the
interpreter is shutting down; instead, these threads are now killed when interpreter is shutting down; instead, these threads are now killed when
they try to take the GIL. they try to take the GIL.

1
Parser/myreadline.c
View File

@ -73,6 +73,7 @@ my_fgets(char *buf, int len, FILE *fp)
} }
#endif /* MS_WINDOWS */ #endif /* MS_WINDOWS */
if (feof(fp)) { if (feof(fp)) {
clearerr(fp);
return -1; /* EOF */ return -1; /* EOF */
} }
#ifdef EINTR #ifdef EINTR