X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/49052eeadcd62b9fda6be660c490d04577b6eabe..f31c389d72cb0607f2faaa23fc955955e7353445:/mytest.py

diff --git a/mytest.py b/mytest.py
index d71f457e..522b9b39 100644
--- a/mytest.py
+++ b/mytest.py
@@ -22,24 +22,27 @@ InitFallbackFiles()
 eDVBDB.getInstance().reloadBouquets()
 
 try:
-	from twisted.internet import e2reactor
+	import e2reactor
 	e2reactor.install()
 	
 	from twisted.internet import reactor
 	
 	def runReactor():
 		reactor.run()
-except:
+except ImportError:
+	print "twisted not available"
 	def runReactor():
 		runMainloop()
 
 # initialize autorun plugins and plugin menu entries
 from Components.PluginComponent import plugins
-plugins.getPluginList(runAutostartPlugins=True)
+plugins.readPluginList()
+
 from Screens.Wizard import wizardManager
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 from Tools.BoundFunction import boundFunction
+from Plugins.Plugin import PluginDescriptor
 
 had = dict()
 
@@ -268,12 +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)
+			quitMainloop(*result)
+			return
 	
 		screen = screensToRun[0]
 		
@@ -330,7 +340,7 @@ import Components.NimManager
 # first, setup a screen
 try:
 	runScreenTest()
-	plugins.getPluginList(runAutoendPlugins=True)
+	plugins.shutdown()
 except:
 	print 'EXCEPTION IN PYTHON STARTUP CODE:'
 	print '-'*60