fix crash in manual scan (and other screens) since config speedups
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 11 Feb 2009 21:15:45 +0000 (22:15 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 11 Feb 2009 21:15:45 +0000 (22:15 +0100)
lib/python/Components/config.py

index 3b61909..c999f2a 100755 (executable)
@@ -178,14 +178,14 @@ class choicesList(object): # XXX: we might want a better name for this
 
        def __list__(self):
                if self.type == choicesList.LIST_TYPE_LIST:
 
        def __list__(self):
                if self.type == choicesList.LIST_TYPE_LIST:
-                       ret = [isinstance(x, tuple) and x[0] or x for x in self.choices]
+                       ret = [not isinstance(x, tuple) and x or x[0] for x in self.choices]
                else:
                        ret = self.choices.keys()
                return ret or [""]
 
        def __iter__(self):
                if self.type == choicesList.LIST_TYPE_LIST:
                else:
                        ret = self.choices.keys()
                return ret or [""]
 
        def __iter__(self):
                if self.type == choicesList.LIST_TYPE_LIST:
-                       ret = [isinstance(x, tuple) and x[0] or x for x in self.choices]
+                       ret = [not isinstance(x, tuple) and x or x[0] for x in self.choices]
                else:
                        ret = self.choices
                return iter(ret or [""])
                else:
                        ret = self.choices
                return iter(ret or [""])
@@ -232,7 +232,7 @@ class choicesList(object): # XXX: we might want a better name for this
 class descriptionList(choicesList): # XXX: we might want a better name for this
        def __list__(self):
                if self.type == choicesList.LIST_TYPE_LIST:
 class descriptionList(choicesList): # XXX: we might want a better name for this
        def __list__(self):
                if self.type == choicesList.LIST_TYPE_LIST:
-                       ret = [isinstance(x, tuple) and x[1] or x for x in self.choices]
+                       ret = [not isinstance(x, tuple) and x or x[1] for x in self.choices]
                else:
                        ret = self.choices.values()
                return ret or [""]
                else:
                        ret = self.choices.values()
                return ret or [""]