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

Import: if PyArg_ParseTuple() returns false PyErr_Clear() must be called first before calling PyArg_ParseTuple() again

Browse Source
This commit is contained in:
wmayer
2022-07-16 11:19:13 +02:00
parent e1ebcef39e
commit 2041eca74c
1 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/Mod/Import/App/AppImportPy.cpp
View File

@@ -501,19 +501,21 @@ private:
}
}
writer.endRun();
return Py::None();
}
catch (const Base::Exception& e) {
throw Py::RuntimeError(e.what());
}
}
} else if (PyArg_ParseTuple(args.ptr(), "O!et|iOs",
&(Part::TopoShapePy::Type) ,
&shapeObj,
"utf-8",
&fname,
&versionParm,
&usePolyline,
&optionSource)) {
PyErr_Clear();
if (PyArg_ParseTuple(args.ptr(), "O!et|iOs", &(Part::TopoShapePy::Type) ,
&shapeObj,
"utf-8",
&fname,
&versionParm,
&usePolyline,
&optionSource)) {
filePath = std::string(fname);
layerName = "none";
PyMem_Free(fname);
@@ -543,14 +545,14 @@ private:
TopoDS_Shape shape = obj->getShape();
writer.exportShape(shape);
writer.endRun();
return Py::None();
}
catch (const Base::Exception& e) {
throw Py::RuntimeError(e.what());
}
} else {
throw Py::TypeError("expected ([Shape],path");
}
return Py::None();
}
throw Py::TypeError("expected ([Shape],path");
}
Py::Object writeDXFObject(const Py::Tuple& args)
@@ -573,7 +575,7 @@ private:
&versionParm,
&usePolyline,
&optionSource)) {
filePath = std::string(fname);
filePath = std::string(fname);
layerName = "none";
PyMem_Free(fname);
@@ -612,18 +614,21 @@ private:
}
}
writer.endRun();
return Py::None();
}
catch (const Base::Exception& e) {
throw Py::RuntimeError(e.what());
}
} else if (PyArg_ParseTuple(args.ptr(), "O!et|iOs",
&(App::DocumentObjectPy::Type) ,
&docObj,
"utf-8",
&fname,
&versionParm,
&usePolyline,
&optionSource)) {
}
PyErr_Clear();
if (PyArg_ParseTuple(args.ptr(), "O!et|iOs", &(App::DocumentObjectPy::Type) ,
&docObj,
"utf-8",
&fname,
&versionParm,
&usePolyline,
&optionSource)) {
filePath = std::string(fname);
layerName = "none";
PyMem_Free(fname);
@@ -657,17 +662,15 @@ private:
const TopoDS_Shape& shape = part->Shape.getValue();
writer.exportShape(shape);
writer.endRun();
return Py::None();
}
catch (const Base::Exception& e) {
throw Py::RuntimeError(e.what());
}
} else {
throw Py::TypeError("expected ([DocObject],path");
}
return Py::None();
}
throw Py::TypeError("expected ([DocObject],path");
}
};
/*
static PyObject * importAssembly(PyObject *self, PyObject *args)