From 93ea4c4d2ea2b1ff3dfee40fb114f3080001e4ce Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 16 Feb 2003 18:16:55 +0000 Subject: [PATCH] supply more information about errors when running scripts --- src/python.cc | 6 +++--- src/python.hh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/python.cc b/src/python.cc index eb08775e..0741f2da 100644 --- a/src/python.cc +++ b/src/python.cc @@ -35,12 +35,12 @@ void python_destroy() Py_Finalize(); } -bool python_exec(const std::string &path) +int python_exec(const std::string &path) { FILE *rcpyfd = fopen(path.c_str(), "r"); if (!rcpyfd) { fprintf(stderr, _("Unabled to open python file %s\n"), path.c_str()); - return false; + return 1; } //PyRun_SimpleFile(rcpyfd, const_cast(path.c_str())); @@ -51,7 +51,7 @@ bool python_exec(const std::string &path) assert(dict); PyObject *result = PyRun_File(rcpyfd, const_cast(path.c_str()), Py_file_input, dict, dict); - bool ret = result != NULL; + int ret = result == NULL ? 2 : 0; if (result == NULL) PyErr_Print(); diff --git a/src/python.hh b/src/python.hh index 8c383904..f1d701a8 100644 --- a/src/python.hh +++ b/src/python.hh @@ -231,7 +231,8 @@ typedef void (*EventCallback)(EventData*, void*); void python_init(char *argv0); void python_destroy(); -bool python_exec(const std::string &path); +//! Returns 0 for success, 1 for failing to open the file, 2 for an exception +int python_exec(const std::string &path); #endif // SWIG -- 2.39.2