Merge commit 'origin/master' into tmbinc/FixTimingBugs

[enigma2.git] / lib / python / Components / Converter / FrontendInfo.py

diff --git a/lib/python/Components/Converter/FrontendInfo.py b/lib/python/Components/Converter/FrontendInfo.py
index 35588027a2af90a9a5de2c2bda4d2b05fa25528f..4043a1be53c820cbc0f5c0be1e0555c4b8de6668 100644 (file)
--- a/lib/python/Components/Converter/FrontendInfo.py
+++ b/lib/python/Components/Converter/FrontendInfo.py
@@ -29,7 +29,7 @@ class FrontendInfo(Converter, object):
 
        @cached
        def getText(self):
-               assert self.type not in [self.LOCK, self.SLOT_NUMBER], "the text output of FrontendInfo cannot be used for lock info"
+               assert self.type not in (self.LOCK, self.SLOT_NUMBER), "the text output of FrontendInfo cannot be used for lock info"
                percent = None
                if self.type == self.BER: # as count
                        count = self.source.ber
@@ -54,7 +54,7 @@ class FrontendInfo(Converter, object):
 
        @cached
        def getBool(self):
-               assert self.type in [self.LOCK, self.BER], "the boolean output of FrontendInfo can only be used for lock or BER info"
+               assert self.type in (self.LOCK, self.BER), "the boolean output of FrontendInfo can only be used for lock or BER info"
                if self.type == self.LOCK:
                        lock = self.source.lock
                        if lock is None:
@@ -92,7 +92,8 @@ class FrontendInfo(Converter, object):
                                return 2
                        return -1
                elif self.type == self.SLOT_NUMBER:
-                       return self.source.slot_number or -1
+                       num = self.source.slot_number
+                       return num is None and -1 or num
 
        range = 65536
        value = property(getValue)