X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/88b281557a05fb785a42274bf0f3bc328f9eebfd..e68a1617b7c1efbedf8b28309943dd7669daaad0:/mytest.py

diff --git a/mytest.py b/mytest.py
old mode 100644
new mode 100755
index 8f23beac..efbc34bb
--- a/mytest.py
+++ b/mytest.py
@@ -76,7 +76,6 @@ from Components.PluginComponent import plugins
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
 from Screens.DefaultWizard import *
-from Screens.ImageWizard import *
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 import Screens.Rc
@@ -257,7 +256,7 @@ class Session:
 			self.execEnd(last=False)
 
 	def popCurrent(self):
-		if len(self.dialog_stack):
+		if self.dialog_stack:
 			(self.current_dialog, do_show) = self.dialog_stack.pop()
 			self.execBegin(first=False, do_show=do_show)
 		else:
@@ -276,7 +275,7 @@ class Session:
 		return dlg
 
 	def open(self, screen, *arguments, **kwargs):
-		if len(self.dialog_stack) and not self.in_exec:
+		if self.dialog_stack and not self.in_exec:
 			raise RuntimeError("modal open are allowed only from a screen which is modal!")
 			# ...unless it's the very first screen.
 
@@ -343,6 +342,9 @@ class PowerKey:
 			self.session.open(Screens.Standby.TryQuitMainloop, 1)
 
 	def powerlong(self):
+		if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
+			return
+
 		self.standbyblocked = 1
 		action = config.usage.on_long_powerpress.value
 		if action == "shutdown":
@@ -415,10 +417,7 @@ def runScreenTest():
 
 	CiHandler.setSession(session)
 
-	screensToRun = [ ]
-
-	for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
-		screensToRun.append(p.__call__)
+	screensToRun = [ p.__call__ for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD) ]
 
 	profile("wizards")
 	screensToRun += wizardManager.getWizards()
@@ -442,7 +441,7 @@ def runScreenTest():
 
 		screen = screensToRun[0][1]
 
-		if len(screensToRun):
+		if screensToRun:
 			session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
 		else:
 			session.open(screen)
@@ -474,8 +473,8 @@ def runScreenTest():
 	]
 	wakeupList.sort()
 	recordTimerWakeupAuto = False
-	if len(wakeupList):
-		startTime = wakeupList.pop(0)
+	if wakeupList:
+		startTime = wakeupList[0]
 		if (startTime[0] - nowTime) < 330: # no time to switch box back on
 			wptime = nowTime + 30  # so switch back on in 30 seconds
 		else: