From 56d6613c4d3621cd281025d76879003a998e5289 Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 27 Mar 2020 09:50:42 +0100 Subject: [PATCH] tools (xl_tools): fixed handling of list options labels --- sat/tools/xml_tools.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sat/tools/xml_tools.py b/sat/tools/xml_tools.py index b64021b9..7dd4de57 100644 --- 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