Kaydet (Commit) eea1f5c2 authored tarafından Richard Oudkerk's avatar Richard Oudkerk

Merge

...@@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1? ...@@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
Core and Builtins 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 - Issue #17357: Add missing verbosity messages for -v/-vv that were lost during
the importlib transition. the importlib transition.
......
...@@ -1733,6 +1733,7 @@ builtin_input(PyObject *self, PyObject *args) ...@@ -1733,6 +1733,7 @@ builtin_input(PyObject *self, PyObject *args)
} }
s = PyOS_Readline(stdin, stdout, prompt); s = PyOS_Readline(stdin, stdout, prompt);
if (s == NULL) { if (s == NULL) {
PyErr_CheckSignals();
if (!PyErr_Occurred()) if (!PyErr_Occurred())
PyErr_SetNone(PyExc_KeyboardInterrupt); PyErr_SetNone(PyExc_KeyboardInterrupt);
goto _readline_errors; goto _readline_errors;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment