Base: do not report C++ exception when converting it to Python exception

See https://forum.freecadweb.org/viewtopic.php?f=23&t=56464
FreeCAD · Apr 11, 2021 · 111a21e · 111a21e
1 parent e01f0d2
commit 111a21e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/src/Base/PyObjectBase.h b/src/Base/PyObjectBase.h
@@ -463,12 +463,10 @@ BaseExport extern PyObject* BaseExceptionFreeCADAbort;
 #define __PY_CATCH(R)                                               \
     catch(Base::AbortException &e)                                  \
     {                                                               \
-        e.ReportException();                                        \
         _Py_ErrorObj(R,Base::BaseExceptionFreeCADAbort,e.getPyObject());\
     }                                                               \
     catch(Base::Exception &e)                                       \
     {                                                               \
-        e.ReportException();                                        \
         auto pye = e.getPyExceptionType();                          \
         if(!pye)                                                    \
             pye = Base::BaseExceptionFreeCADError;                  \

diff --git a/src/Mod/Part/App/OCCError.h b/src/Mod/Part/App/OCCError.h
@@ -80,7 +80,6 @@ PartExport extern PyObject* PartExceptionOCCDimensionError;
         str += " ";                                                 \
         if (msg) {str += msg;}                                      \
         else     {str += "No OCCT Exception Message";}              \
-        Base::Console().Error(str.c_str());                         \
         _Py_Error(R,Part::PartExceptionOCCError,str.c_str());       \
     }                                                               \
     _PY_CATCH(R)

diff --git a/src/Tools/generateTemplates/templateClassPyExport.py b/src/Tools/generateTemplates/templateClassPyExport.py
@@ -615,13 +615,11 @@ class @self.export.Namespace.replace("::","_")@Export @self.export.Name@ : publi
     } // Please sync the following catch implementation with PY_CATCH
     catch(Base::AbortException &e)
     {
-        e.ReportException();
         PyErr_SetObject(Base::BaseExceptionFreeCADAbort,e.getPyObject());
         return NULL;
     }
     catch(Base::Exception &e)
     {
-        e.ReportException();
         auto pye = e.getPyExceptionType();
         if(!pye)
             pye = Base::BaseExceptionFreeCADError;
@@ -790,13 +788,11 @@ class @self.export.Namespace.replace("::","_")@Export @self.export.Name@ : publi
     } // Please sync the following catch implementation with PY_CATCH
     catch(Base::AbortException &e)
     {
-        e.ReportException();
         PyErr_SetObject(Base::BaseExceptionFreeCADAbort,e.getPyObject());
         return NULL;
     }
     catch(Base::Exception &e)
     {
-        e.ReportException();
         auto pye = e.getPyExceptionType();
         if(!pye)
             pye = Base::BaseExceptionFreeCADError;
@@ -852,13 +848,11 @@ class @self.export.Namespace.replace("::","_")@Export @self.export.Name@ : publi
     } // Please sync the following catch implementation with PY_CATCH
     catch(Base::AbortException &e)
     {
-        e.ReportException();
         PyErr_SetObject(Base::BaseExceptionFreeCADAbort,e.getPyObject());
         return -1;
     }
     catch(Base::Exception &e)
     {
-        e.ReportException();
         auto pye = e.getPyExceptionType();
         if(!pye)
             pye = Base::BaseExceptionFreeCADError;