fixes for python 2.6 by Moritz Venn

[vuplus_dvbapp] / lib / python / Plugins / DemoPlugins / TestPlugin / plugin.py

diff --git a/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py b/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py
index dae4d4a..69f935e 100644 (file)
--- a/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py
+++ b/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py
@@ -1,10 +1,9 @@
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Components.ActionMap import NumberActionMap
-from Components.Label import Label
 from Components.Input import Input
 from Components.Pixmap import Pixmap
-from Components.FileList import FileEntryComponent, FileList
+from Components.FileList import FileList
 from Screens.ChoiceBox import ChoiceBox
 from Plugins.Plugin import PluginDescriptor
 
@@ -26,7 +25,7 @@ class Test(Screen):
                                
                self["actions"] = NumberActionMap(["WizardActions", "InputActions"],
                {
-                       "ok": self.ok,
+                       "ok": self.openTest,
                        "back": self.close,
 #                      "left": self.keyLeft,
 #                      "right": self.keyRight,
@@ -42,15 +41,17 @@ class Test(Screen):
                        "0": self.keyNumberGlobal
                }, -1)
                
-               self.onShown.append(self.openTest)
+               #self.onShown.append(self.openTest)
 
        def openTest(self):
-               self.session.openWithCallback(self.callback, MessageBox, _("Test-Messagebox?"))
+               self.session.openWithCallback(self.mycallback, MessageBox, _("Test-Messagebox?"))
 
 #              self.session.open(InputBox)
        
-       def callback(self, answer):
+       def mycallback(self, answer):
                print "answer:", answer
+               if answer:
+                       raise Exception("test-crash")
                self.close()
        
        def keyLeft(self):
@@ -71,7 +72,8 @@ class Test(Screen):
                self["text"].number(number)
 
 def main(session, **kwargs):
-       session.openWithCallback(test, MessageBox, _("Test-Messagebox?"), timeout = 10)
+       session.open(Test)
+       #session.openWithCallback(test, MessageBox, _("Test-Messagebox?"), timeout = 10)
        #session.openWithCallback(test, ChoiceBox, title="Delete everything on this Dreambox?", list=[(_("yes"), "yes"), (_("no"), "no"), (_("perhaps"), "perhaps"), (_("ask me tomorrow"), "ask me tomorrow"), (_("leave me alone with this!"), "yes")])
        
 def test(returnValue):