diff options
| author | Gregory P. Smith <greg@krypto.org> | 2013-03-19 22:05:52 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2013-03-19 22:05:52 (GMT) |
| commit | cca8507758d69f8109ef25cd610218cfb4a3326b (patch) | |
| tree | c84a1a4eba43beda4a9b29726bf1d33bc8004bf0 /Modules | |
| parent | 0408bf9cfb0dac07bf378f10af771fab41ba0d52 (diff) | |
| parent | d17ca23828287eb79f28de7c50acf25c29b41e4e (diff) | |
| download | cpython-cca8507758d69f8109ef25cd610218cfb4a3326b.zip cpython-cca8507758d69f8109ef25cd610218cfb4a3326b.tar.gz cpython-cca8507758d69f8109ef25cd610218cfb4a3326b.tar.bz2 | |
merge heads in 3.3
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_cursesmodule.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 4e1449b..35f9fc1 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -1138,7 +1138,9 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyObject *args) } if (rtn == ERR) { /* getch() returns ERR in nodelay mode */ - PyErr_SetString(PyCursesError, "no input"); + PyErr_CheckSignals(); + if (!PyErr_Occurred()) + PyErr_SetString(PyCursesError, "no input"); return NULL; } else if (rtn<=255) { return Py_BuildValue("C", rtn); |