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

disable Py::Exception(const std::string&) constructor as it will be removed in future PyCXX versions

Browse Source
This commit is contained in:
wmayer
2018-04-29 11:00:28 +02:00
parent ebadc3ae9a
commit 5e484d0a92
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/CXX/Python2/Exception.hxx
View File

@@ -62,10 +62,11 @@ namespace Py
explicit Exception ()
{}
Exception (const std::string& reason)
{
PyErr_SetString (Py::_Exc_RuntimeError(), reason.c_str());
}
// This overloaded constructor will be removed in future PyCXX versions
//Exception (const std::string& reason)
//{
// PyErr_SetString (Py::_Exc_RuntimeError(), reason.c_str());
//}
Exception (PyObject* exception, const std::string& reason)
{

1
src/CXX/Python3/Exception.hxx
View File

@@ -63,6 +63,7 @@ namespace Py
explicit Exception ()
{}
// This overloaded constructor will be removed in future PyCXX versions
//Exception (const std::string &reason)
//{
// PyErr_SetString( Py::_Exc_RuntimeError(), reason.c_str() );

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

@@ -366,7 +366,7 @@ private:
PyObject *shapeObj;
char* name;
if (!PyArg_ParseTuple(args.ptr(), "Oet", &shapeObj, "utf-8",&name)) {
throw Py::Exception("expected (Page,path");
throw Py::TypeError("expected (Page,path");
}
std::string filePath = std::string(name);

10
src/Mod/TechDraw/App/AppTechDrawPy.cpp
View File

@@ -527,7 +527,7 @@ private:
char* name;
PyObject *alignObj = Py_True;
if (!PyArg_ParseTuple(args.ptr(), "Oet|O", &viewObj, "utf-8",&name,&alignObj)) {
throw Py::Exception("expected (view,path");
throw Py::TypeError("expected (view,path");
}
std::string filePath = std::string(name);
@@ -559,15 +559,15 @@ private:
}
return Py::None();
}
}
Py::Object writeDXFPage(const Py::Tuple& args)
{
PyObject *pageObj;
char* name;
if (!PyArg_ParseTuple(args.ptr(), "Oet", &pageObj, "utf-8",&name)) {
throw Py::Exception("expected (page,path");
}
throw Py::TypeError("expected (page,path");
}
std::string filePath = std::string(name);
std::string layerName = "none";
@@ -576,7 +576,7 @@ private:
try {
ImpExpDxfWrite writer(filePath);
writer.setLayerName(layerName);
App::DocumentObject* obj = 0;
TechDraw::DrawViewPart* dvp = 0;
TechDraw::DrawPage* dp = 0;