aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-02-11 22:15:45 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-02-11 22:15:45 +0100
commitcfb43dc930adbbf59879abf8f3f0297caa94a050 (patch)
tree5c4712b07407ecb65f7f7443cb789f19bacd88b7 /lib/python
parent8a83490dca1b493de60451d6969d126c7e42d80c (diff)
downloadenigma2-cfb43dc930adbbf59879abf8f3f0297caa94a050.tar.gz
enigma2-cfb43dc930adbbf59879abf8f3f0297caa94a050.zip
fix crash in manual scan (and other screens) since config speedups
Diffstat (limited to 'lib/python')
-rwxr-xr-xlib/python/Components/config.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 3b61909f..c999f2aa 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -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:
- 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:
- 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 [""])
@@ -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:
- 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 [""]