GUI: JAG: fixes flaw parsing flag names when passed parameters were IntFlags

Signed-off-by: Jed Reynolds <jed@candelatech.com>
This commit is contained in:
Jed Reynolds
2021-08-16 12:00:21 -07:00
parent e4ca8851a3
commit 43e7afd882

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
"""----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- """----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
Generated by LANforge JsonApiPythonGenerator, Fri Aug 13 15:25:24 PDT 2021 Generated by LANforge JsonApiPythonGenerator, Mon Aug 16 11:58:20 PDT 2021
- - WORK IN PROGRESS - - - - WORK IN PROGRESS - -
The API this library provides is actively being changed. The API this library provides is actively being changed.
This file expects to live in py-json/LANforge directory. This file expects to live in py-json/LANforge directory.
@@ -2274,9 +2274,14 @@ class LFJsonPost(LFCliBase):
if type(flag_names) is list: if type(flag_names) is list:
selected_flags = [] selected_flags = []
for flag in flag_names: for flag in flag_names:
if flag not in flag_class.__members__: if isinstance(flag, str):
raise ValueError("%s has no member:[%s]" % (flag_class.__class__.__name__, flag)) if flag not in flag_class.__members__:
selected_flags.extend([flag_class[member].value for member in flag_class.__members__ if member == flag]) raise ValueError("%s has no member:[%s]" % (flag_class.__class__.__name__, flag))
selected_flags.extend([flag_class[member].value for member in flag_class.__members__ if member == flag])
if isinstance(flag, IntFlag):
if flag not in flag_class:
raise ValueError("%s has no member:[%s]" % (flag_class.__class__.__name__, flag))
selected_flags.extend([member.value for member in flag_class if member == flag])
selected_flags.append(starting_value) selected_flags.append(starting_value)
return sum(selected_flags) return sum(selected_flags)
f_name = None f_name = None