diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2013-04-03 12:49:36 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2013-04-03 12:49:36 (GMT) |
| commit | eea1f5c2e448b6c4b95bf0b782bbe25a8cdd9aca (patch) | |
| tree | e1a6ff3a552a51795145dd43af4947ef10adf9ef | |
| parent | c616604a15ad7954c6e99238a9870934ee66393a (diff) | |
| parent | 614c578dec856dc8a255b27a63559c6912ddc2e8 (diff) | |
| download | cpython-eea1f5c2e448b6c4b95bf0b782bbe25a8cdd9aca.zip cpython-eea1f5c2e448b6c4b95bf0b782bbe25a8cdd9aca.tar.gz cpython-eea1f5c2e448b6c4b95bf0b782bbe25a8cdd9aca.tar.bz2 | |
Merge
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Python/bltinmodule.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -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 index f794d41..a486b49 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; |