X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mytest.py;h=efbc34bb4d61e1a63eb572cd61a72b5b6cf8f382;hb=574f425cc1ebece0aa5f09fb77a8cb7ad0310a1f;hp=423031fb983d954bd8081bc98fb47030fab4a6c8;hpb=64281edbf808514b65c333f134f2f824a2dcae36;p=vuplus_dvbapp

diff --git a/mytest.py b/mytest.py
index 423031f..efbc34b 100755
--- a/mytest.py
+++ b/mytest.py
@@ -256,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:
@@ -275,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.
 
@@ -342,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":
@@ -414,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()
@@ -441,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)
@@ -473,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: