Change ATOM and RSS feed representations to use name value pairs instead of just strings, to allow support for all ATOM and RSS attributes and avoid confusion with non-feed string results.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1079292 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 8 deletions

diff --git a/sca-cpp/trunk/modules/python/eval.hpp b/sca-cpp/trunk/modules/python/eval.hpp
index bf539faa38..65cd7f0ef7 100644
--- a/sca-cpp/trunk/modules/python/eval.hpp
+++ b/sca-cpp/trunk/modules/python/eval.hpp
@@ -66,17 +66,12 @@ const string lastError() {
             PyObject* sval = PyObject_Str(val);    
             string msg = string() + PyString_AsString(stype) + " : " + PyString_AsString(sval);
             Py_DECREF(stype);
-            Py_DECREF(sval);                                    
-            Py_DECREF(type);
-            Py_DECREF(val);
-            Py_XDECREF(trace);
+            Py_DECREF(sval);
+            PyErr_Restore(type, val, trace);
             PyErr_Print();
             return msg;
         }
-        PyErr_Print();
-        Py_XDECREF(type);
-        Py_XDECREF(val);
-        Py_XDECREF(trace);
+        PyErr_Restore(type, val, trace);
         PyErr_Print();
         return "Unknown Python error";
     }