[Python-checkins] cpython (2.7): Backed out changeset 7c19f1f792c6

benjamin.peterson python-checkins at python.org
Thu Aug 21 00:30:52 CEST 2014


http://hg.python.org/cpython/rev/ec2efc094d62
changeset:   92169:ec2efc094d62
branch:      2.7
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Aug 20 17:30:40 2014 -0500
summary:
  Backed out changeset 7c19f1f792c6

files:
  Modules/readline.c |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Modules/readline.c b/Modules/readline.c
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -933,15 +933,19 @@
     begidx = PyInt_FromLong(0L);
     endidx = PyInt_FromLong(0L);
 
+#ifndef __APPLE__
     if (!isatty(STDOUT_FILENO)) {
         /* Issue #19884: stdout is no 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"). */
+           "\033[1034h").
+
+           With libedit, this call makes readline() crash. */
         rl_variable_bind ("enable-meta-key", "off");
     }
+#endif
 
     /* Initialize (allows .inputrc to override)
      *
@@ -953,7 +957,6 @@
         rl_read_init_file(NULL);
     else
 #endif /* __APPLE__ */
-    if (isatty(STDOUT_FILENO))
         rl_initialize();
 
     RESTORE_LOCALE(saved_locale)

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list