Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
  ........
................
This commit is contained in:
Antoine Pitrou 2009-10-19 18:24:35 +00:00
parent aaf85ce859
commit e566bda297
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -30,6 +30,9 @@ Core and Builtins
Library 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 #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment
- Issue #7082: When falling back to the MIME 'name' parameter, the - Issue #7082: When falling back to the MIME 'name' parameter, the

7
Modules/readline.c
View File

@ -758,6 +758,10 @@ on_completion(const char *text, int state)
static char ** static char **
flex_complete(char *text, int start, int end) 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(begidx);
Py_XDECREF(endidx); Py_XDECREF(endidx);
begidx = PyLong_FromLong((long) start); begidx = PyLong_FromLong((long) start);
@ -800,9 +804,6 @@ setup_readline(void)
rl_completer_word_break_characters = rl_completer_word_break_characters =
strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?"); strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
/* All nonalphanums except '.' */ /* All nonalphanums except '.' */
#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
rl_completion_append_character ='\0';
#endif
begidx = PyLong_FromLong(0L); begidx = PyLong_FromLong(0L);
endidx = PyLong_FromLong(0L); endidx = PyLong_FromLong(0L);