mirror of https://github.com/python/cpython
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:
commit
db932786af
|
@ -10,6 +10,9 @@ What's New in Python 3.2.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.
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue