21526665 new readline upsets python 2.6
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 30 Jul 2015 07:06:12 -0700
changeset 4721 0cedda14cdba
parent 4720 1ccedfc24ebb
child 4722 2bd832ea7ef7
21526665 new readline upsets python 2.6
components/python/python26/patches/Python26-41.readline.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python26/patches/Python26-41.readline.patch	Thu Jul 30 07:06:12 2015 -0700
@@ -0,0 +1,29 @@
+Ported from 2.7, to deal with readline upgrade.
+
+--- Python-2.6.8/Modules/readline.c.~1~	2012-04-10 08:32:10.000000000 -0700
++++ Python-2.6.8/Modules/readline.c	2015-07-30 06:43:44.942800226 -0700
[email protected]@ -801,7 +801,7 @@
+  * before calling the normal completer */
+ 
+ static char **
+-flex_complete(char *text, int start, int end)
++flex_complete(const char *text, int start, int end)
+ {
+ #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+     rl_completion_append_character ='\0';
[email protected]@ -841,12 +841,12 @@
+     rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
+     rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
+     /* Set our hook functions */
+-    rl_startup_hook = (Function *)on_startup_hook;
++    rl_startup_hook = on_startup_hook;
+ #ifdef HAVE_RL_PRE_INPUT_HOOK
+-    rl_pre_input_hook = (Function *)on_pre_input_hook;
++    rl_pre_input_hook = on_pre_input_hook;
+ #endif
+     /* Set our completion function */
+-    rl_attempted_completion_function = (CPPFunction *)flex_complete;
++    rl_attempted_completion_function = flex_complete;
+     /* Set Python word break characters */
+     rl_completer_word_break_characters =
+         strdup(" \t\n`[email protected]#$%^&*()-=+[{]}\\|;:'\",<>/?");