From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 24 Jan 2014 16:44:40 +0000 (-0500)
Subject: merge 3.3 (#20374)
X-Git-Tag: v3.4.0b3~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3bf14d1ebce053852298d4a83d524afa670ffc7;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#20374)
---

c3bf14d1ebce053852298d4a83d524afa670ffc7
diff --cc Modules/readline.c
index ed83818b7c9f,4ee17a91cd97..02521aaca4bb
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@@ -935,12 -877,8 +935,12 @@@ on_completion(const char *text, int sta
   * before calling the normal completer */
  
  static char **
- flex_complete(char *text, int start, int end)
+ flex_complete(const char *text, int start, int end)
  {
 +    char **result;
 +#ifdef WITH_THREAD
 +    PyGILState_STATE gilstate = PyGILState_Ensure();
 +#endif
  #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
      rl_completion_append_character ='\0';
  #endif