mirror of
https://github.com/PyCQA/flake8.git
synced 2026-04-10 14:54:17 +00:00
Rely on flakey's new ability to skip stdin errors
Resolves our half of tickets #53, and #53 I believe.
This commit is contained in:
parent
3bd8a21f62
commit
9cd5dbc96f
2 changed files with 10 additions and 5 deletions
|
|
@ -92,8 +92,8 @@ def check_file(path, ignore=(), complexity=-1):
|
||||||
|
|
||||||
|
|
||||||
def check_code(code, ignore=(), complexity=-1):
|
def check_code(code, ignore=(), complexity=-1):
|
||||||
warning = flakey.check(code, 'stdin')
|
warning = flakey.check(code, '<stdin>')
|
||||||
warnings = flakey.print_messages(warning, ignore=ignore)
|
warnings = flakey.print_messages(warning, ignore=ignore, code=code)
|
||||||
warnings += pep8style.input_file(None, lines=code.split('\n'))
|
warnings += pep8style.input_file(None, lines=code.split('\n'))
|
||||||
if complexity > -1:
|
if complexity > -1:
|
||||||
warnings += mccabe.get_code_complexity(code, complexity)
|
warnings += mccabe.get_code_complexity(code, complexity)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
from __future__ import with_statement
|
from __future__ import with_statement
|
||||||
import re
|
import re
|
||||||
import os
|
import os
|
||||||
|
from io import StringIO
|
||||||
|
|
||||||
pep8style = None
|
pep8style = None
|
||||||
|
|
||||||
|
|
@ -29,14 +30,18 @@ def skip_line(line):
|
||||||
_NOQA = re.compile(r'flake8[:=]\s*noqa', re.I | re.M)
|
_NOQA = re.compile(r'flake8[:=]\s*noqa', re.I | re.M)
|
||||||
|
|
||||||
|
|
||||||
def skip_file(path):
|
def skip_file(path, source=None):
|
||||||
"""Returns True if this header is found in path
|
"""Returns True if this header is found in path
|
||||||
|
|
||||||
# flake8: noqa
|
# flake8: noqa
|
||||||
"""
|
"""
|
||||||
if not os.path.isfile(path):
|
if os.path.isfile(path):
|
||||||
|
f = open(path)
|
||||||
|
elif source:
|
||||||
|
f = StringIO(source)
|
||||||
|
else:
|
||||||
return False
|
return False
|
||||||
f = open(path)
|
|
||||||
try:
|
try:
|
||||||
content = f.read()
|
content = f.read()
|
||||||
finally:
|
finally:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue