Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Python console auto-completion #859

Merged
merged 2 commits into from
Apr 15, 2019
Merged

Fix Python console auto-completion #859

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e71696
BUG: Python3: Fix ctkPythonConsoleCompleter to look up "__code__" ins…
jcfr Apr 15, 2019
5dc3396
BUG: Python3: Fix python console auto-completion
jcfr Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions Libs/Scripting/Python/Widgets/ctkPythonConsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,20 @@ int ctkPythonConsoleCompleter::parameterCountBuiltInFunction(const QString& pyth
{
int parameterCount = 0;
PyObject* pFunction = this->PythonManager.pythonModule(pythonFunctionName);
if (pFunction && PyObject_HasAttrString(pFunction, "__doc__"))
if (pFunction)
{
PyObject* pDoc = PyObject_GetAttrString(pFunction, "__doc__");
QString docString = PyString_AsString(pDoc);
QString argumentExtract = docString.mid(docString.indexOf("(")+1, docString.indexOf(")") - docString.indexOf("(")-1);
QStringList arguments = argumentExtract.split(",", QString::SkipEmptyParts);
parameterCount = arguments.count();
Py_DECREF(pDoc);
if (PyObject_HasAttrString(pFunction, "__doc__"))
{
PyObject* pDoc = PyObject_GetAttrString(pFunction, "__doc__");
if (PyString_Check(pDoc))
{
QString docString = PyString_AsString(pDoc);
QString argumentExtract = docString.mid(docString.indexOf("(")+1, docString.indexOf(")") - docString.indexOf("(")-1);
QStringList arguments = argumentExtract.split(",", QString::SkipEmptyParts);
parameterCount = arguments.count();
}
Py_DECREF(pDoc);
}
Py_DECREF(pFunction);
}
return parameterCount;
Expand All @@ -206,7 +212,11 @@ int ctkPythonConsoleCompleter::parameterCountUserDefinedFunction(const QString&
PyObject* pFunction = this->PythonManager.pythonModule(pythonFunctionName);
if (PyCallable_Check(pFunction))
{
#if PY_MAJOR_VERSION >= 3
PyObject* fc = PyObject_GetAttrString(pFunction, "__code__");
#else
PyObject* fc = PyObject_GetAttrString(pFunction, "func_code");
#endif
if (fc)
{
PyObject* ac = PyObject_GetAttrString(fc, "co_argcount");
Expand All @@ -228,7 +238,11 @@ int ctkPythonConsoleCompleter::parameterCountUserDefinedClassFunction(const QStr
PyObject* pFunction = this->PythonManager.pythonObject(pythonFunctionName);
if (PyCallable_Check(pFunction))
{
#if PY_MAJOR_VERSION >= 3
PyObject* fc = PyObject_GetAttrString(pFunction, "__code__");
#else
PyObject* fc = PyObject_GetAttrString(pFunction, "func_code");
#endif
if (fc)
{
PyObject* ac = PyObject_GetAttrString(fc, "co_argcount");
Expand Down Expand Up @@ -260,6 +274,7 @@ int ctkPythonConsoleCompleter::parameterCountFromDocumentation(const QString& py
QStringList arguments = argumentExtract.split(",", QString::SkipEmptyParts);
parameterCount = arguments.count();
}
Py_DECREF(pDoc);
}
Py_DECREF(pFunction);
}
Expand Down