X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6dcb75c26bbfec04b381bb99d75404f9fe50635d..8d4316d824f584eb3900fef898de59c9aca8d771:/lib/python/python.cpp diff --git a/lib/python/python.cpp b/lib/python/python.cpp index 8947bb3c..50b66103 100644 --- a/lib/python/python.cpp +++ b/lib/python/python.cpp @@ -3,6 +3,8 @@ #undef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 200112L extern "C" void init_enigma(); +extern "C" void eBaseInit(void); +extern "C" void eConsoleInit(void); extern void bsodFatal(); #define SKIP_PART2 @@ -114,18 +116,6 @@ void ePyObject::decref(const char *file, int line) #include #undef SKIP_PART1 -DEFINE_REF(TestObj); - -TestObj::TestObj() -{ - eDebug("create %p", this); -} - -TestObj::~TestObj() -{ - eDebug("destroy %p", this); -} - ePython::ePython() { // Py_VerboseFlag = 1; @@ -133,8 +123,11 @@ ePython::ePython() // Py_OptimizeFlag = 1; Py_Initialize(); - + PyEval_InitThreads(); + init_enigma(); + eBaseInit(); + eConsoleInit(); } ePython::~ePython() @@ -142,6 +135,16 @@ ePython::~ePython() Py_Finalize(); } +int ePython::execFile(const char *file) +{ + FILE *fp = fopen(file, "r"); + if (!fp) + return -ENOENT; + int ret = PyRun_SimpleFile(fp, file); + fclose(fp); + return ret; +} + int ePython::execute(const std::string &pythonfile, const std::string &funcname) { ePyObject pName, pModule, pDict, pFunc, pArgs, pValue; @@ -199,6 +202,11 @@ int ePython::call(ePyObject pFunc, ePyObject pArgs) } else { PyErr_Print(); + ePyObject FuncStr = PyObject_Str(pFunc); + ePyObject ArgStr = PyObject_Str(pArgs); + eDebug("(PyObject_CallObject(%s,%s) failed)", PyString_AS_STRING(FuncStr), PyString_AS_STRING(ArgStr)); + Py_DECREF(FuncStr); + Py_DECREF(ArgStr); bsodFatal(); } }