[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/ebaeeb36eb4b
changeset:   103107:ebaeeb36eb4b
parent:      103105:9206a86f7321
parent:      103106:fb7c89a66d23
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Sep 05 18:26:26 2016 -0700
summary:
  merge 3.5

files:
  Modules/readline.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/readline.c b/Modules/readline.c
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -1080,7 +1080,7 @@
     Py_XDECREF(readlinestate_global->endidx);
     readlinestate_global->begidx = PyLong_FromLong((long) start);
     readlinestate_global->endidx = PyLong_FromLong((long) end);
-    result = completion_matches(text, *on_completion);
+    result = completion_matches((char *)text, *on_completion);
 #ifdef WITH_THREAD
     PyGILState_Release(gilstate);
 #endif

-- 
Repository URL: https://hg.python.org/cpython