mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #24266: Merge readline Ctrl+C handling from 3.5

Browse source
This commit is contained in:
Martin Panter 2016-03-22 09:28:58 +00:00
commit 0b2d71bc70
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -232,6 +232,9 @@ Core and Builtins
Library Library
------- -------
- Issue #24266: Ctrl+C during Readline history search now cancels the search
mode when compiled with Readline 7.
- Issue #26590: Implement a safe finalizer for the _socket.socket type. It now - Issue #26590: Implement a safe finalizer for the _socket.socket type. It now
releases the GIL to close the socket. releases the GIL to close the socket.

3
Modules/readline.c
View file

@ -1138,6 +1138,9 @@ readline_until_enter_or_signal(const char *prompt, int *signal)
#endif #endif
if (s < 0) { if (s < 0) {
rl_free_line_state(); rl_free_line_state();
#if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION >= 0x0700
rl_callback_sigcleanup();
#endif
rl_cleanup_after_signal(); rl_cleanup_after_signal();
rl_callback_handler_remove(); rl_callback_handler_remove();
*signal = 1; *signal = 1;