some fixes for twisted

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 9d2998ba47440387945da48ac56d7ad69ed6e504..9dba16ea99c54417795fab74afc6e33fabc5cea4 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -17,7 +17,7 @@ from Navigation import Navigation
 from skin import readSkin, applyAllAttributes
 
 from Components.config import configfile
-from Tools.Directories import InitFallbackFiles
+from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS
 InitFallbackFiles()
 eDVBDB.getInstance().reloadBouquets()
 
@@ -36,7 +36,7 @@ except ImportError:
 
 # initialize autorun plugins and plugin menu entries
 from Components.PluginComponent import plugins
-plugins.readPluginList()
+plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
 from Screens.Wizard import wizardManager
 from Screens.StartWizard import *
@@ -120,22 +120,22 @@ class Session:
                self.currentDialog.execEnd()
                self.currentDialog.hide()
        
-       def create(self, screen, arguments):
+       def create(self, screen, arguments, **kwargs):
                # creates an instance of 'screen' (which is a class)
                try:
-                       return screen(self, *arguments)
+                       return screen(self, *arguments, **kwargs)
                except:
-                       errstr = "Screen %s(%s): %s" % (str(screen), str(arguments), sys.exc_info()[0])
+                       errstr = "Screen %s(%s, %s): %s" % (str(screen), str(arguments), str(kwargs), sys.exc_info()[0])
                        print errstr
                        traceback.print_exc(file=sys.stdout)
                        quitMainloop(5)
                        
        
-       def instantiateDialog(self, screen, *arguments):
+       def instantiateDialog(self, screen, *arguments, **kwargs):
                # create dialog
                
                try:
-                       dlg = self.create(screen, arguments)
+                       dlg = self.create(screen, arguments, **kwargs)
                except:
                        print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
                        print '-'*60
@@ -184,13 +184,13 @@ class Session:
                self.currentDialog.callback = None # would cause re-entrancy problems.
                self.execBegin()
 
-       def openWithCallback(self, callback, screen, *arguments):
-               dlg = self.open(screen, *arguments)
+       def openWithCallback(self, callback, screen, *arguments, **kwargs):
+               dlg = self.open(screen, *arguments, **kwargs)
                dlg.callback = callback
 
-       def open(self, screen, *arguments):
+       def open(self, screen, *arguments, **kwargs):
                self.pushCurrent()
-               dlg = self.currentDialog = self.instantiateDialog(screen, *arguments)
+               dlg = self.currentDialog = self.instantiateDialog(screen, *arguments, **kwargs)
                dlg.isTmp = True
                dlg.callback = None
                self.execBegin()
@@ -271,14 +271,19 @@ def runScreenTest():
        
        session.nav = Navigation()
        
-       screensToRun = wizardManager.getWizards()
+       screensToRun = [ ]
+       
        for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
                screensToRun.append(p.__call__)
+       
+       screensToRun += wizardManager.getWizards()
+       
        screensToRun.append(Screens.InfoBar.InfoBar)
 
        def runNextScreen(session, screensToRun, *result):
                if result:
                        quitMainloop(*result)
+                       return
        
                screen = screensToRun[0]