Add a safe evaluation of a python function which does not throw any exception.

[tools/py2cpp.git] / src / PyFunction.hxx

diff --git a/src/PyFunction.hxx b/src/PyFunction.hxx
index 65cb05265a0d1e24cbdf99cb87efc062091fec1f..6e208478ba77ba1d91b7c0ca9674f00ed5e5c579 100644 (file)
--- a/src/PyFunction.hxx
+++ b/src/PyFunction.hxx
@@ -46,7 +46,7 @@ public:
    * You can use getLastPyError in order to get the last python error.
    */
   template <class ...Ts>
-  PyPtr operator()(const Ts&... args)
+  PyPtr safeEval(const Ts&... args)
   {
     PyPtr result;
     PyObject * myFunc = get();
@@ -56,6 +56,17 @@ public:
       PyPtr pyArgs(toPy(tupleArgs));
       result.reset(PyObject_CallObject(myFunc, pyArgs.get()));
     }
+    return result;
+  }
+
+  /*!
+   * The evaluation throws ExecutionException if the python function throws an
+   * exception.
+   */
+  template <class ...Ts>
+  PyPtr operator()(const Ts&... args)
+  {
+    PyPtr result = safeEval(args...);
     if(!result)
     {
       std::string errorMessage = "Failed to execute python function.\n";