git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add jpg support. Please note that 32bit bitmaps require 4x the memory of 8bit, possib...
[enigma2.git]
/
lib
/
python
/
python.cpp
diff --git
a/lib/python/python.cpp
b/lib/python/python.cpp
index 8947bb3ca12826f63e0a4d811809c560ca705c63..84716e7226626f5b9ce119b4411d3b1c2d595793 100644
(file)
--- a/
lib/python/python.cpp
+++ b/
lib/python/python.cpp
@@
-114,18
+114,6
@@
void ePyObject::decref(const char *file, int line)
#include <lib/python/python.h>
#undef SKIP_PART1
#include <lib/python/python.h>
#undef SKIP_PART1
-DEFINE_REF(TestObj);
-
-TestObj::TestObj()
-{
- eDebug("create %p", this);
-}
-
-TestObj::~TestObj()
-{
- eDebug("destroy %p", this);
-}
-
ePython::ePython()
{
// Py_VerboseFlag = 1;
ePython::ePython()
{
// Py_VerboseFlag = 1;
@@
-133,7
+121,8
@@
ePython::ePython()
// Py_OptimizeFlag = 1;
Py_Initialize();
// Py_OptimizeFlag = 1;
Py_Initialize();
-
+ PyEval_InitThreads();
+
init_enigma();
}
init_enigma();
}
@@
-199,6
+188,11
@@
int ePython::call(ePyObject pFunc, ePyObject pArgs)
} else
{
PyErr_Print();
} 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();
}
}
bsodFatal();
}
}