zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug with '# noqa' filtering (#3993)

Browse Source
This commit is contained in:
Adam J. Stewart
2017-04-26 00:23:01 -05:00
committed by Todd Gamblin
parent 33c9a91d85
commit 11dae722c2
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spack/spack/cmd/flake8.py
View File

@@ -139,14 +139,6 @@ def filter_file(source, dest, output=False):
# We still want to catch trailing whitespace warnings
line = line.rstrip('\n')
if line == '# flake8: noqa':
# Entire file is ignored
break
if line.endswith('# noqa'):
# Line is already ignored
continue
for file_pattern, errors in exemptions.items():
if not file_pattern.search(source):
continue
@@ -154,7 +146,10 @@ def filter_file(source, dest, output=False):
for code, patterns in errors.items():
for pattern in patterns:
if pattern.search(line):
if '# noqa: ' in line:
if line.endswith('# noqa'):
# Line is already ignored
pass
elif '# noqa: ' in line:
line += ',{0}'.format(code)
else:
line += ' # noqa: {0}'.format(code)