[Python-checkins] cpython (merge 3.3 -> default): Merge
richard.oudkerk
python-checkins at python.org
Wed Apr 3 14:51:04 CEST 2013
http://hg.python.org/cpython/rev/b79025925eab
changeset: 83081:b79025925eab
parent: 83079:3b1dbe7a2aa0
parent: 83080:241cd716bf5f
user: Richard Oudkerk <shibturn at gmail.com>
date: Wed Apr 03 13:49:36 2013 +0100
summary:
Merge
files:
Misc/NEWS | 2 ++
Python/bltinmodule.c | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
Core and Builtins
-----------------
+- Issue #17619: Make input() check for Ctrl-C correctly on Windows.
+
- Issue #17357: Add missing verbosity messages for -v/-vv that were lost during
the importlib transition.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1733,6 +1733,7 @@
}
s = PyOS_Readline(stdin, stdout, prompt);
if (s == NULL) {
+ PyErr_CheckSignals();
if (!PyErr_Occurred())
PyErr_SetNone(PyExc_KeyboardInterrupt);
goto _readline_errors;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list