cpython: c9f07c69b138 (original) (raw)

Mercurial > cpython

changeset 69996:c9f07c69b138 2.7

(Merge 3.1) Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, clear the end-of-file indicator after CTRL+d. [#1195]

Victor Stinner victor.stinner@haypocalc.com
date	Tue, 10 May 2011 00:22:59 +0200
parents	dd088470f090
children	3c87a13980be
files	Misc/NEWS Parser/myreadline.c
diffstat	2 files changed, 4 insertions(+), 0 deletions(-)[+] [-] Misc/NEWS 3 Parser/myreadline.c 1

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -9,6 +9,9 @@ What's New in Python 2.7.2? 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 #8651: PyArg_Parse*() functions raise an OverflowError if the file doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int (length bigger than 2^31-1 bytes).

--- a/Parser/myreadline.c +++ b/Parser/myreadline.c @@ -77,6 +77,7 @@ my_fgets(char *buf, int len, FILE fp) } #endif / MS_WINDOWS */ if (feof(fp)) {

       clearerr(fp);[](#l2.7)
       return -1; /* EOF */[](#l2.8)
   }[](#l2.9)

#ifdef EINTR