git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use LoadPixmap with cached instead of global loadPNG (to optimize enigma2 startup...
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index 3b61909f81b44557704360e7b4370efe7f36ec60..a813d3cadda77a8b5d9167a4d88f750248017658 100755
(executable)
--- 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:
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 [""]
@@
-1426,8
+1426,8
@@
class ConfigSubList(list, object):
def getSavedValue(self):
res = { }
def getSavedValue(self):
res = { }
- for i
in range(len(self)
):
- sv =
self[i]
.saved_value
+ for i
, val in enumerate(self
):
+ sv =
val
.saved_value
if sv is not None:
res[str(i)] = sv
return res
if sv is not None:
res[str(i)] = sv
return res
@@
-1448,7
+1448,7
@@
class ConfigSubList(list, object):
item.load()
def dict(self):
item.load()
def dict(self):
- return dict([(str(index), value) for index, value in
self.enumerate(
)])
+ return dict([(str(index), value) for index, value in
enumerate(self
)])
# same as ConfigSubList, just as a dictionary.
# care must be taken that the 'key' has a proper
# same as ConfigSubList, just as a dictionary.
# care must be taken that the 'key' has a proper