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

App: [skip ci] extend Python wrapper of hasExtension() to have full control over calling the C++ function

Browse Source
This commit is contained in:
wmayer
2020-03-17 14:03:14 +01:00
parent 10d802698b
commit 8401b563da
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/App/ExtensionContainerPyImp.cpp
View File

@@ -174,19 +174,21 @@ int ExtensionContainerPy::setCustomAttributes(const char* /*attr*/, PyObject * /
PyObject* ExtensionContainerPy::hasExtension(PyObject *args) {
char *type;
if (!PyArg_ParseTuple(args, "s", &type))
PyObject *deriv = Py_True;
if (!PyArg_ParseTuple(args, "s|O", &type, &deriv))
return NULL; // NULL triggers exception
//get the extension type asked for
bool derived = PyObject_IsTrue(deriv);
Base::Type extension = Base::Type::fromName(type);
if(extension.isBad() || !extension.isDerivedFrom(App::Extension::getExtensionClassTypeId())) {
if (extension.isBad() || !extension.isDerivedFrom(App::Extension::getExtensionClassTypeId())) {
std::stringstream str;
str << "No extension found of type '" << type << "'" << std::ends;
throw Py::Exception(Base::BaseExceptionFreeCADError,str.str());
}
bool val = false;
if (getExtensionContainerPtr()->hasExtension(extension)) {
if (getExtensionContainerPtr()->hasExtension(extension, derived)) {
val = true;
}