Merge branch 'bug_723_infobarext_pvr'
[enigma2.git] / timer.py
index 750a8c0..aaae0b2 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -66,7 +66,7 @@ class TimerEntry:
 
                        day = []
                        flags = self.repeated
 
                        day = []
                        flags = self.repeated
-                       for x in range(0, 7):
+                       for x in (0, 1, 2, 3, 4, 5, 6):
                                if (flags & 1 == 1):
                                        day.append(0)
                                        print "Day: " + str(x)
                                if (flags & 1 == 1):
                                        day.append(0)
                                        print "Day: " + str(x)
@@ -222,7 +222,7 @@ class Timer:
                min = int(time()) + self.MaxWaitTime
                
                # calculate next activation point
                min = int(time()) + self.MaxWaitTime
                
                # calculate next activation point
-               if len(self.timer_list):
+               if self.timer_list:
                        w = self.timer_list[0].getNextActivation()
                        if w < min:
                                min = w
                        w = self.timer_list[0].getNextActivation()
                        if w < min:
                                min = w
@@ -246,7 +246,7 @@ class Timer:
        
        def doActivate(self, w):
                self.timer_list.remove(w)
        
        def doActivate(self, w):
                self.timer_list.remove(w)
-               
+
                # when activating a timer which has already passed,
                # simply abort the timer. don't run trough all the stages.
                if w.shouldSkip():
                # when activating a timer which has already passed,
                # simply abort the timer. don't run trough all the stages.
                if w.shouldSkip():
@@ -278,5 +278,5 @@ class Timer:
                t = int(time()) + 1
                
                # we keep on processing the first entry until it goes into the future.
                t = int(time()) + 1
                
                # we keep on processing the first entry until it goes into the future.
-               while len(self.timer_list) and self.timer_list[0].getNextActivation() < t:
+               while self.timer_list and self.timer_list[0].getNextActivation() < t:
                        self.doActivate(self.timer_list[0])
                        self.doActivate(self.timer_list[0])