Skip to content

Commit

Permalink
Fix confusing ReadError traceback
Browse files Browse the repository at this point in the history
Avoids confusing tracebacks when ReadErrors exceptions are raised
from the yaml reader.

Now we do print the filename that failed to load and stop processing
in order to avoid additional exceptions.

Also adds tests to prevent future regressions.

Fixes: #261
  • Loading branch information
ssbarnea committed May 2, 2020
1 parent 512fe17 commit ed3946b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
4 changes: 4 additions & 0 deletions tests/test_syntax_errors.py
Expand Up @@ -92,3 +92,7 @@ def test_sets(self):
' a:\n'
' set\n'
'...\n', None)

def test_non_printable_characters(self):
self.check('output: \x1b\n',
None, problem=(9, 0))
6 changes: 6 additions & 0 deletions yamllint/linter.py
Expand Up @@ -183,6 +183,12 @@ def get_syntax_error(buffer):
'syntax error: ' + e.problem + ' (syntax)')
problem.level = 'error'
return problem
except yaml.reader.ReaderError as e:
problem = LintProblem(e.position + 1,
0,
'syntax error: ' + e.reason + ' (syntax)')
problem.level = 'error'
return problem


def _run(buffer, conf, filepath):
Expand Down
5 changes: 3 additions & 2 deletions yamllint/parser.py
Expand Up @@ -121,9 +121,9 @@ def comments_between_tokens(token1, token2):


def token_or_comment_generator(buffer):
yaml_loader = yaml.BaseLoader(buffer)

try:
yaml_loader = yaml.BaseLoader(buffer)
prev = None
curr = yaml_loader.get_token()
while curr is not None:
Expand All @@ -139,7 +139,8 @@ def token_or_comment_generator(buffer):
prev = curr
curr = next

except yaml.scanner.ScannerError:
# errors like this are already analysed by get_syntax_error
except (yaml.scanner.ScannerError, yaml.reader.ReaderError):
pass


Expand Down

0 comments on commit ed3946b

Please sign in to comment.