From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 27 Aug 2016 03:23:11 +0000 (+0000)
Subject: Issue #19884: Avoid spurious output on OS X with Gnu Readline
X-Git-Tag: v3.6.0b1~539^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c427b8d517469005d53128e9656213a3ec141890;p=thirdparty%2FPython%2Fcpython.git

Issue #19884: Avoid spurious output on OS X with Gnu Readline

Also adjust the test condition, because enable-meta-key was only added in
6.1, not 6.0.
---

diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index 8c2ad856cc2c..2c73df291f0c 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
diff --git a/Misc/NEWS b/Misc/NEWS
index f9e2d09ebd43..290cf867fa4b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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 91f7cca73e3d..383b19abbcce 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)
      *