diff options
| author | Gregory P. Smith <greg@krypto.org> | 2013-03-19 15:03:26 -0700 |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2013-03-19 15:03:26 -0700 |
| commit | dd351628942718ede440c8ffe6911f379c9e15b1 (patch) | |
| tree | 1c0937103d8a7c54f185dfd208a02192da369f04 /Modules | |
| parent | 029273fc903bcbdd689132f153d53004a8aee0b2 (diff) | |
| parent | 843fae93121ac7ac1088b0521773eff567e7b41c (diff) | |
| download | cpython-git-dd351628942718ede440c8ffe6911f379c9e15b1.tar.gz | |
merge heads in 3.2
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 5e1afa9894..d1dedb0bb0 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -895,7 +895,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); |