From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 9 May 2011 22:20:35 +0000 (+0200)
Subject: Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, clear
X-Git-Tag: v3.2.1rc1~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db932786afdd569bbf2d6b84cfd5cdcb16cb4f27;p=thirdparty%2FPython%2Fcpython.git

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

db932786afdd569bbf2d6b84cfd5cdcb16cb4f27
diff --cc Misc/NEWS
index 6c942afba8c9,951a136c40ce..4a4767ebe62c
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,10 -10,9 +10,13 @@@ 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.
 +
  - 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