kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: improve integrated Python console:

Browse Source 
* correctly handle the case that Py_BuildValue() can return a null pointer
* fix a latin1 <-> UTF-8 conversion problem
This commit is contained in:
wmayer
2022-08-07 17:50:28 +02:00
parent 05816ee764
commit 2d592e06a0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/PythonConsole.cpp
View File

@@ -190,8 +190,8 @@ PyObject* InteractiveInterpreter::compile(const char* source) const
PyObject* eval = PyObject_CallObject(func,args); // must decref later
#endif
Py_DECREF(args);
Py_DECREF(func);
Py_XDECREF(args);
Py_XDECREF(func);
if (eval){
return eval;
@@ -356,11 +356,10 @@ void InteractiveInterpreter::runCode(PyCodeObject* code) const
*/
bool InteractiveInterpreter::push(const char* line)
{
d->buffer.append(QString::fromLatin1(line));
d->buffer.append(QString::fromUtf8(line));
QString source = d->buffer.join(QLatin1String("\n"));
try {
// Source is already UTF-8, so we can use toLatin1()
bool more = runSource(source.toLatin1());
bool more = runSource(source.toUtf8());
if (!more)
d->buffer.clear();
return more;