lib/python/Components/config.py: revert previous change because of side effects
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 20 Oct 2010 18:18:14 +0000 (20:18 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 20 Oct 2010 18:18:36 +0000 (20:18 +0200)
lib/python/Components/config.py

index 08dd3745e8e97f0dbbf983400c0e3ee5b344fd03..d7506e31a275a0fb9a03a62b7cfabdd12b840df4 100755 (executable)
@@ -179,7 +179,7 @@ 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 = [not isinstance(x, tuple) and x or len(x) > 0 and x[0] or len(x) == 0 and 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 [""]
                else:
                        ret = self.choices.keys()
                return ret or [""]