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.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index f87e939..c02c3cd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -100,6 +100,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 #7086: Added TCP support to SysLogHandler, and tidied up some
diff --git a/Modules/readline.c b/Modules/readline.c
index 03c95e3..51844f7 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -800,6 +800,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);
@@ -842,9 +846,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);