mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-25 20:01:25 -07:00
Make Reporter class hold all results, move line/col into results, and out of message (#24127)
* Make Reporter class hold all results, move line/col into results, and out of message * Move line/col out of message for YAML parser errors * We have lineno for the DOC var, use it for YAML parser errors * Remove valdiate-modules files from legacy-files * pep8 indentation fixes * Add todo for line/col in _validate_docs_schema
This commit is contained in:
parent
6522d703a1
commit
2fbfba0ef3
5 changed files with 385 additions and 226 deletions
|
@ -85,17 +85,25 @@ def parse_yaml(value, lineno, module, name, load_all=False):
|
|||
except yaml.MarkedYAMLError as e:
|
||||
e.problem_mark.line += lineno - 1
|
||||
e.problem_mark.name = '%s.%s' % (module, name)
|
||||
errors.append('%s is not valid YAML. Line %d column %d' %
|
||||
(name, e.problem_mark.line + 1,
|
||||
e.problem_mark.column + 1))
|
||||
errors.append({
|
||||
'msg': '%s is not valid YAML' % name,
|
||||
'line': e.problem_mark.line + 1,
|
||||
'column': e.problem_mark.column + 1
|
||||
})
|
||||
traces.append(e)
|
||||
except yaml.reader.ReaderError as e:
|
||||
traces.append(e)
|
||||
errors.append('%s is not valid YAML. Character '
|
||||
'0x%x at position %d.' %
|
||||
(name, e.character, e.position))
|
||||
# TODO: Better line/column detection
|
||||
errors.append({
|
||||
'msg': ('%s is not valid YAML. Character '
|
||||
'0x%x at position %d.' % (name, e.character, e.position)),
|
||||
'line': lineno
|
||||
})
|
||||
except yaml.YAMLError as e:
|
||||
traces.append(e)
|
||||
errors.append('%s is not valid YAML: %s: %s' % (name, type(e), e))
|
||||
errors.append({
|
||||
'msg': '%s is not valid YAML: %s: %s' % (name, type(e), e),
|
||||
'line': lineno
|
||||
})
|
||||
|
||||
return data, errors, traces
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue