(Merge 3.3) Issue #17209: curses.window.get_wch() now handles correctly KeyboardInterrupt (CTRL+c)

This commit is contained in:
Victor Stinner 2013-03-21 12:21:43 +01:00
commit d06b35c1b6
2 changed files with 6 additions and 0 deletions

View File

@ -292,6 +292,9 @@ Core and Builtins
Library
-------
- Issue #17209: curses.window.get_wch() now handles correctly KeyboardInterrupt
(CTRL+c).
- Issue #5713: smtplib now handles 421 (closing connection) error codes when
sending mail by closing the socket and reporting the 421 error code via the
exception appropriate to the command that received the error response.

View File

@ -1181,6 +1181,9 @@ PyCursesWindow_Get_WCh(PyCursesWindowObject *self, PyObject *args)
return NULL;
}
if (ct == ERR) {
if (PyErr_CheckSignals())
return NULL;
/* get_wch() returns ERR in nodelay mode */
PyErr_SetString(PyCursesError, "no input");
return NULL;