diff options
| -rw-r--r-- | Lib/test/test_readline.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/readline.c | 27 |
3 files changed, 18 insertions, 13 deletions
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py index 8c2ad85..2c73df2 100644 --- a/Lib/test/test_readline.py +++ b/Lib/test/test_readline.py @@ -111,7 +111,7 @@ class TestHistoryManipulation (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") def test_init(self): # Issue #19884: Ensure that the ANSI sequence "\033[1034h" is not @@ -50,6 +50,8 @@ Core and Builtins Library ------- +- Issue #19884: Avoid spurious output on OS X with Gnu Readline. + - Issue #10513: Fix a regression in Connection.commit(). Statements should not be reset after a commit. diff --git a/Modules/readline.c b/Modules/readline.c index 91f7cca..383b19a 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1129,19 +1129,22 @@ setup_readline(readlinestate *mod_state) mod_state->begidx = PyLong_FromLong(0L); mod_state->endidx = PyLong_FromLong(0L); -#ifndef __APPLE__ - 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"); - } +#ifdef __APPLE__ + if (!using_libedit_emulation) #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) * |