[Python-checkins] r75534 - in python/branches/release31-maint: Misc/NEWS Modules/readline.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Mon Oct 19 20:24:35 2009
New Revision: 75534

Log:
Merged revisions 75533 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75533 | antoine.pitrou | 2009-10-19 20:22:37 +0200 (lun., 19 oct. 2009) | 14 lines
  
  Merged revisions 75531-75532 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r75531 | antoine.pitrou | 2009-10-19 20:17:18 +0200 (lun., 19 oct. 2009) | 4 lines
    
    Issue #5833: Fix extra space character in readline completion with the
    GNU readline library version 6.0.
  ........
    r75532 | antoine.pitrou | 2009-10-19 20:20:21 +0200 (lun., 19 oct. 2009) | 3 lines
    
    NEWS entry for r75531.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/readline.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Oct 19 20:24:35 2009
@@ -30,6 +30,9 @@
 Library
 -------
 
+- Issue #5833: Fix extra space character in readline completion with the
+  GNU readline library version 6.0.
+
 - Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment 
 
 - Issue #7082: When falling back to the MIME 'name' parameter, the

Modified: python/branches/release31-maint/Modules/readline.c
==============================================================================
--- python/branches/release31-maint/Modules/readline.c	(original)
+++ python/branches/release31-maint/Modules/readline.c	Mon Oct 19 20:24:35 2009
@@ -758,6 +758,10 @@
 static char **
 flex_complete(char *text, int start, int end)
 {
+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+	rl_completion_append_character ='\0';
+	rl_completion_suppress_append = 0;
+#endif
 	Py_XDECREF(begidx);
 	Py_XDECREF(endidx);
 	begidx = PyLong_FromLong((long) start);
@@ -800,9 +804,6 @@
 	rl_completer_word_break_characters =
 		strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
 		/* All nonalphanums except '.' */
-#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-	rl_completion_append_character ='\0';
-#endif
 
 	begidx = PyLong_FromLong(0L);
 	endidx = PyLong_FromLong(0L);