let conditional .not work on default vars

Instead of needing the variable value to be directly declared, it could
be one of the default values.
pull/1967/head
Yossef Mendelssohn 8 months ago
parent 6b54f7b811
commit 66cfcb53d7

@ -399,8 +399,17 @@ class DataFile:
error_text = "- exists" error_text = "- exists"
con_var_value = var_key[:-7] con_var_value = var_key[:-7]
elif var_key.endswith(".not"): elif var_key.endswith(".not"):
if var_key[:-4] in variables: var_name = var_key[:-4]
con_var_value = variables[var_key[:-4]] if var_name in variables:
con_var_value = variables[var_name]
if isinstance(var_value, list):
if con_var_value in var_value:
error_text = f'in {var_value}'
elif str(con_var_value) == str(var_value):
error_text = f'is "{var_value}"'
elif var_name in default:
# TODO: consolidate
con_var_value = default[var_name]
if isinstance(var_value, list): if isinstance(var_value, list):
if con_var_value in var_value: if con_var_value in var_value:
error_text = f'in {var_value}' error_text = f'in {var_value}'

Loading…
Cancel
Save