summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2013-04-03 13:44:50 +0100
committerRichard Oudkerk <shibturn@gmail.com>2013-04-03 13:44:50 +0100
commit614c578dec856dc8a255b27a63559c6912ddc2e8 (patch)
tree0cb9ed9368ebf93f6c423e828341537c1eb5aa21
parentd8a46969f7034d9a56e70d24fc77e15154135199 (diff)
downloadcpython-git-614c578dec856dc8a255b27a63559c6912ddc2e8.tar.gz
Issue #17619: Make input() check for Ctrl-C correctly on Windows.
-rw-r--r--Misc/NEWS2
-rw-r--r--Python/bltinmodule.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 621cdaa7e4..da04b0ee52 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.3.2?
Core and Builtins
-----------------
+- Issue #17619: Make input() check for Ctrl-C correctly on Windows.
+
- Issue #17610: Don't rely on non-standard behavior of the C qsort() function.
- Issue #17357: Add missing verbosity output when using -v/-vv.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index bf90aba3a2..75afa860f1 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -1733,6 +1733,7 @@ builtin_input(PyObject *self, PyObject *args)
}
s = PyOS_Readline(stdin, stdout, prompt);
if (s == NULL) {
+ PyErr_CheckSignals();
if (!PyErr_Occurred())
PyErr_SetNone(PyExc_KeyboardInterrupt);
goto _readline_errors;