Merge

shibturn · shibturn · commit eea1f5c2e448 · 2013-04-03T13:49:36.000+01:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
 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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1733,6 +1733,7 @@ builtin_input(PyObject self, PyObject args)`
`1733`	`1733`	`}`
`1734`	`1734`	`s = PyOS_Readline(stdin, stdout, prompt);`
`1735`	`1735`	`if (s == NULL) {`
	`1736`	`+ PyErr_CheckSignals();`
`1736`	`1737`	`if (!PyErr_Occurred())`
`1737`	`1738`	`PyErr_SetNone(PyExc_KeyboardInterrupt);`
`1738`	`1739`	`goto _readline_errors;`