templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Config Reader] Just moved code to make it easier to maintain 

To ensure VALID_IMPORT is in sync
This commit is contained in:
Salvador E. Tropea 2024-01-19 10:40:01 -03:00
parent 8cdd6aa0be
commit 8deb71ccea
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kibot/config_reader.py
View File

@ -527,6 +527,12 @@ class CfgYamlReader(object):
fn = outs = filters = vars = globals = pre = groups = None fn = outs = filters = vars = globals = pre = groups = None
explicit_outs = is_external = False explicit_outs = is_external = False
for k, v in entry.items(): for k, v in entry.items():
if k not in VALID_IMPORT:
msg = f"Unknown import entry `{k}`"
best_matches = difflib.get_close_matches(k, VALID_IMPORT)
if best_matches:
msg += " (did you mean {}?)".format(' or '.join(best_matches))
self._config_error_import(fn, msg)
if k == 'file': if k == 'file':
if not isinstance(v, str): if not isinstance(v, str):
raise KiPlotConfigurationError("`import.file` must be a string ({})".format(str(v))) raise KiPlotConfigurationError("`import.file` must be a string ({})".format(str(v)))
@ -557,12 +563,6 @@ class CfgYamlReader(object):
if not isinstance(v, dict): if not isinstance(v, dict):
CfgYamlReader._config_error_import(fn, 'definitions must be a dict') CfgYamlReader._config_error_import(fn, 'definitions must be a dict')
local_defs = v local_defs = v
else:
msg = f"Unknown import entry `{k}`"
best_matches = difflib.get_close_matches(k, VALID_IMPORT)
if best_matches:
msg += " (did you mean {}?)".format(' or '.join(best_matches))
self._config_error_import(fn, msg)
if fn is None: if fn is None:
raise KiPlotConfigurationError("`import` entry without `file` ({})".format(str(entry))) raise KiPlotConfigurationError("`import` entry without `file` ({})".format(str(entry)))
else: else: