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

App: Use PyObject_IsTrue in combination with conditional ternary operator

Browse Source
This commit is contained in:
marioalexis
2022-05-17 10:51:11 -03:00
committed by Chris Hennes
parent 7798e8f42b
commit 1bc43b8606
6 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/App/GroupExtensionPyImp.cpp
View File

@@ -256,12 +256,12 @@ PyObject* GroupExtensionPy::getObject(PyObject *args)
PyObject* GroupExtensionPy::hasObject(PyObject *args)
{
PyObject *object;
PyObject *recursivePy = nullptr;
int recursive = 0;
if (!PyArg_ParseTuple(args, "O!|O", &(DocumentObjectPy::Type), &object, &recursivePy))
PyObject *recursivePy = Py_False;
if (!PyArg_ParseTuple(args, "O!|O!", &(DocumentObjectPy::Type), &object, &PyBool_Type, &recursivePy))
return nullptr;
DocumentObjectPy* docObj = static_cast<DocumentObjectPy*>(object);
bool recursive = PyObject_IsTrue(recursivePy) ? true : false;
if (!docObj->getDocumentObjectPtr() || !docObj->getDocumentObjectPtr()->getNameInDocument()) {
PyErr_SetString(Base::PyExc_FC_GeneralError, "Cannot check an invalid object");
return nullptr;
@@ -270,14 +270,6 @@ PyObject* GroupExtensionPy::hasObject(PyObject *args)
PyErr_SetString(Base::PyExc_FC_GeneralError, "Cannot check an object from another document with this group");
return nullptr;
}
if (recursivePy) {
recursive = PyObject_IsTrue(recursivePy);
if ( recursive == -1) {
// Note: shouldn't happen
PyErr_SetString(PyExc_ValueError, "The recursive parameter should be of boolean type");
return nullptr;
}
}
bool v = getGroupExtensionPtr()->hasObject(docObj->getDocumentObjectPtr(), recursive);
return PyBool_FromLong(v ? 1 : 0);