tools (xl_tools): fixed handling of list options labels

2020-03-27 09:50:42 +01:00 · 2020-03-27 09:50:42 +01:00 · 56d6613c4d
commit 56d6613c4d
parent 658da6abe4
1 changed files with 10 additions and 1 deletions
--- a/sat/tools/xml_tools.py
+++ b/sat/tools/xml_tools.py
@ -471,7 +471,16 @@ def _paramsGetListOptions(param):
    elems = param.getElementsByTagName("option")
    if len(elems) == 0:
        return []
-    options = [elem.getAttribute("value") for elem in elems]
+    options = []
+    for elem in elems:
+        value = elem.getAttribute("value")
+        if not value:
+            raise exceptions.InternalError("list option must have a value")
+        label = elem.getAttribute("label")
+        if label:
+            options.append((value, label))
+        else:
+            options.append(value)
    selected = [
        elem.getAttribute("value")
        for elem in elems