Merge branch 'fix/disable_noqa' into 'master'

`--disable-noqa` does not override `# flake8: noqa`

Closes #590

See merge request pycqa/flake8!380
This commit is contained in:
Anthony Sottile 2019-12-03 17:45:45 +00:00
commit 21d2adf21f
3 changed files with 15 additions and 1 deletions

View file

@ -346,7 +346,10 @@ class FileProcessor(object):
:rtype:
bool
"""
if any(defaults.NOQA_FILE.match(line) for line in self.lines):
if (
not self.options.disable_noqa
and any(defaults.NOQA_FILE.match(line) for line in self.lines)
):
return True
elif any(defaults.NOQA_FILE.search(line) for line in self.lines):
LOG.warning(