summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/python/mod-python.hpp
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-05-28 04:39:18 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-05-28 04:39:18 +0000
commitf278315081b24b59bf73e9613e552e3519200a71 (patch)
treecdfe0e8d00e2c3e8002284c4541429f91cb66e68 /sca-cpp/trunk/modules/python/mod-python.hpp
parentc3eb9d1e20e1f8a7a101854d6a883692cac4e8d0 (diff)
Improve error reporting with a reason code. Improve debug and audit logging. Fix test scripts to cleanup state from previous builds and correctly report test errors.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1343138 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/python/mod-python.hpp')
-rw-r--r--sca-cpp/trunk/modules/python/mod-python.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sca-cpp/trunk/modules/python/mod-python.hpp b/sca-cpp/trunk/modules/python/mod-python.hpp
index a4d77775a5..e6effb985b 100644
--- a/sca-cpp/trunk/modules/python/mod-python.hpp
+++ b/sca-cpp/trunk/modules/python/mod-python.hpp
@@ -52,7 +52,7 @@ struct applyImplementation {
const value expr = append<value>(params, px);
debug(expr, "modeval::python::applyImplementation::input");
const failable<value> res = python::evalScript(expr, impl, py);
- const value val = !hasContent(res)? mklist<value>(value(), reason(res)) : mklist<value>(content(res));
+ const value val = !hasContent(res)? mklist<value>(value(), reason(res), rcode(res)) : mklist<value>(content(res));
debug(val, "modeval::python::applyImplementation::result");
return val;
}
@@ -70,7 +70,7 @@ const failable<lambda<value(const list<value>&)> > evalImplementation(const stri
return mkfailure<lambda<value(const list<value>&)> >(string("Could not read implementation: ") + fpath);
const failable<PyObject*> script = python::readScript(python::moduleName(spath), fpath, is, py);
if (!hasContent(script))
- return mkfailure<lambda<value(const list<value>&)> >(reason(script));
+ return mkfailure<lambda<value(const list<value>&)> >(script);
return lambda<value(const list<value>&)>(applyImplementation(content(script), px, py));
}