mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
(Merge 3.3) Issue #17209: curses.window.get_wch() now handles correctly KeyboardInterrupt (CTRL+c)
This commit is contained in:
commit
d06b35c1b6
2 changed files with 6 additions and 0 deletions
|
@ -292,6 +292,9 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #17209: curses.window.get_wch() now handles correctly KeyboardInterrupt
|
||||||
|
(CTRL+c).
|
||||||
|
|
||||||
- Issue #5713: smtplib now handles 421 (closing connection) error codes when
|
- 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
|
sending mail by closing the socket and reporting the 421 error code via the
|
||||||
exception appropriate to the command that received the error response.
|
exception appropriate to the command that received the error response.
|
||||||
|
|
|
@ -1181,6 +1181,9 @@ PyCursesWindow_Get_WCh(PyCursesWindowObject *self, PyObject *args)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (ct == ERR) {
|
if (ct == ERR) {
|
||||||
|
if (PyErr_CheckSignals())
|
||||||
|
return NULL;
|
||||||
|
|
||||||
/* get_wch() returns ERR in nodelay mode */
|
/* get_wch() returns ERR in nodelay mode */
|
||||||
PyErr_SetString(PyCursesError, "no input");
|
PyErr_SetString(PyCursesError, "no input");
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue