a little consolidation/cleanup

pull/1967/head
Yossef Mendelssohn 8 months ago
parent 66cfcb53d7
commit 33be6976e1

@ -400,16 +400,8 @@ class DataFile:
con_var_value = var_key[:-7] con_var_value = var_key[:-7]
elif var_key.endswith(".not"): elif var_key.endswith(".not"):
var_name = var_key[:-4] var_name = var_key[:-4]
if var_name in variables: if var_name in variables or var_name in default:
con_var_value = variables[var_name] con_var_value = variables[var_name] if var_name in variables else default[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