Revert "Pre-compile mytest.py"
authorMike Looijmans <milo-software@users.sourceforge.net>
Wed, 31 Aug 2011 16:16:32 +0000 (18:16 +0200)
committerMike Looijmans <milo-software@users.sourceforge.net>
Wed, 31 Aug 2011 16:16:32 +0000 (18:16 +0200)
This reverts commit 0e6b3a58a83b6f2b85d7ebfa5cb84b134c034fb4.

This was the cause of the hanging EPGImport plugin, various threading issues
and the box would not shutdown properly.

(There's a thin line between brave and stupid. Now I know why it's still called mytest.py...)

Makefile.am
main.py [deleted file]
main/enigma.cpp
mytest.py

index 0ee225f..cae7114 100755 (executable)
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
 installdir = $(pkglibdir)/python
 install_PYTHON = \
        Navigation.py NavigationInstance.py RecordTimer.py SleepTimer.py ServiceReference.py \
-       keyids.py keymapparser.py main.py mytest.py skin.py timer.py GlobalActions.py \
+       keyids.py keymapparser.py mytest.py skin.py timer.py GlobalActions.py \
        e2reactor.py
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/main.py b/main.py
deleted file mode 100644 (file)
index 3411cd5..0000000
--- a/main.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import sys, os
-if os.path.isfile("/usr/lib/enigma2/python/enigma.zip"):
-       sys.path.append("/usr/lib/enigma2/python/enigma.zip")
-import mytest
-
index 99f23e4..1cdd867 100644 (file)
@@ -235,7 +235,7 @@ int main(int argc, char **argv)
        setIoPrio(IOPRIO_CLASS_BE, 3);
 
 //     python.execute("mytest", "__main__");
-       python.execFile(eEnv::resolve("${libdir}/enigma2/python/main.py").c_str());
+       python.execFile(eEnv::resolve("${libdir}/enigma2/python/mytest.py").c_str());
 
        extern void setFullsize(); // definend in lib/gui/evideo.cpp
        setFullsize();
index 07dd96a..924fd51 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,4 +1,7 @@
 import sys, os
+if os.path.isfile("/usr/lib/enigma2/python/enigma.zip"):
+       sys.path.append("/usr/lib/enigma2/python/enigma.zip")
+
 from Tools.Profile import profile, profile_final
 profile("PYTHON_START")