diff options
Diffstat (limited to '3rdparty/python-console/modified')
| -rw-r--r-- | 3rdparty/python-console/modified/pyinterpreter.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/3rdparty/python-console/modified/pyinterpreter.cc b/3rdparty/python-console/modified/pyinterpreter.cc index 89c9b88c..cbb6322f 100644 --- a/3rdparty/python-console/modified/pyinterpreter.cc +++ b/3rdparty/python-console/modified/pyinterpreter.cc @@ -82,19 +82,29 @@ const std::list<std::string> &pyinterpreter_suggest(const std::string &hint) PyEval_AcquireThread(m_threadState); m_suggestions.clear(); int i = 0; - std::string command = string_format("sys.completer.complete('%s', %d)\n", hint.c_str(), i); + std::string escaped; + for (char c : hint) { + if (c == '\'' || c == '\\') + escaped += '\\'; + escaped += c; + } + std::string command = string_format("sys.completer.complete('%s', %d)\n", escaped.c_str(), i); std::string res; do { PyObject *py_result; PyObject *dum; py_result = Py_CompileString(command.c_str(), "<stdin>", Py_single_input); + if (py_result == nullptr) + break; dum = PyEval_EvalCode(py_result, glb, loc); + if (dum == nullptr) + break; Py_XDECREF(dum); Py_XDECREF(py_result); res = redirector_take_output(m_threadState); ++i; - command = string_format("sys.completer.complete('%s', %d)\n", hint.c_str(), i); + command = string_format("sys.completer.complete('%s', %d)\n", escaped.c_str(), i); if (res.size()) { // throw away the newline res = res.substr(1, res.size() - 3); |