mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #19884: Merge Readline updates from 3.5

This commit is contained in:
Martin Panter 2016-08-27 04:03:26 +00:00
parent ef91bb2660 c427b8d517
commit aac9b71632
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/test/test_readline.py
View File

@ -111,7 +111,7 @@ def test_nonascii_history(self):
class TestReadline(unittest.TestCase): class TestReadline(unittest.TestCase):
@unittest.skipIf(readline._READLINE_VERSION < 0x0600 and not is_editline, @unittest.skipIf(readline._READLINE_VERSION < 0x0601 and not is_editline,
"not supported in this library version") "not supported in this library version")
def test_init(self): def test_init(self):
# Issue #19884: Ensure that the ANSI sequence "\033[1034h" is not # Issue #19884: Ensure that the ANSI sequence "\033[1034h" is not

2
Misc/NEWS
View File

@ -46,6 +46,8 @@ Core and Builtins
Library Library
------- -------
- Issue #19884: Avoid spurious output on OS X with Gnu Readline.
- Issue #10513: Fix a regression in Connection.commit(). Statements should - Issue #10513: Fix a regression in Connection.commit(). Statements should
not be reset after a commit. not be reset after a commit.

27
Modules/readline.c
View File

@ -1146,19 +1146,22 @@ setup_readline(readlinestate *mod_state)
mod_state->begidx = PyLong_FromLong(0L); mod_state->begidx = PyLong_FromLong(0L);
mod_state->endidx = PyLong_FromLong(0L); mod_state->endidx = PyLong_FromLong(0L);
#ifndef __APPLE__ #ifdef __APPLE__
if (!isatty(STDOUT_FILENO)) { if (!using_libedit_emulation)
/* Issue #19884: stdout is not a terminal. Disable meta modifier
keys to not write the ANSI sequence "\033[1034h" into stdout. On
terminals supporting 8 bit characters like TERM=xterm-256color
(which is now the default Fedora since Fedora 18), the meta key is
used to enable support of 8 bit characters (ANSI sequence
"\033[1034h").
With libedit, this call makes readline() crash. */
rl_variable_bind ("enable-meta-key", "off");
}
#endif #endif
{
if (!isatty(STDOUT_FILENO)) {
/* Issue #19884: stdout is not a terminal. Disable meta modifier
keys to not write the ANSI sequence "\033[1034h" into stdout. On
terminals supporting 8 bit characters like TERM=xterm-256color
(which is now the default Fedora since Fedora 18), the meta key is
used to enable support of 8 bit characters (ANSI sequence
"\033[1034h").
With libedit, this call makes readline() crash. */
rl_variable_bind ("enable-meta-key", "off");
}
}
/* Initialize (allows .inputrc to override) /* Initialize (allows .inputrc to override)
* *