pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-10 14:54:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #69

Browse source 
Note to self: I also have to make sure the VCS hooks work with the new
pyflakes API.
This commit is contained in:
Ian Cordasco 2013-02-13 09:51:32 -05:00
parent 10cc0f3391
commit 064f986d9a
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
flake8/main.py
View file

@ -65,13 +65,14 @@ def main():
if opts.exit_zero: if opts.exit_zero:
raise SystemExit(0) raise SystemExit(0)
raise SystemExit(warnings) raise SystemExit(warnings > 0)
def check_file(path, ignore=(), complexity=-1, reporter=None): def check_file(path, ignore=(), complexity=-1, reporter=None):
if pep8style.excluded(path): if pep8style.excluded(path):
return 0 return 0
warnings = pyflakes.api.checkPath(path, reporter) warnings = pyflakes.api.checkPath(path, reporter)
warnings -= reporter.ignored_warnings
warnings += pep8style.input_file(path) warnings += pep8style.input_file(path)
if complexity > -1: if complexity > -1:
warnings += mccabe.get_module_complexity(path, complexity) warnings += mccabe.get_module_complexity(path, complexity)
@ -80,6 +81,7 @@ def check_file(path, ignore=(), complexity=-1, reporter=None):
def check_code(code, ignore=(), complexity=-1, reporter=None): def check_code(code, ignore=(), complexity=-1, reporter=None):
warnings = pyflakes.api.check(code, '<stdin>', reporter) warnings = pyflakes.api.check(code, '<stdin>', reporter)
warnings -= reporter.ignored_warnings
warnings += pep8style.input_file('-', lines=code.split('\n')) warnings += pep8style.input_file('-', lines=code.split('\n'))
if complexity > -1: if complexity > -1:
warnings += mccabe.get_code_complexity(code, complexity) warnings += mccabe.get_code_complexity(code, complexity)

2
flake8/util.py
View file

@ -137,12 +137,14 @@ class Flake8Reporter(reporter.Reporter):
def __init__(self, ignore=None): def __init__(self, ignore=None):
super(Flake8Reporter, self).__init__(sys.stdout, sys.stderr) super(Flake8Reporter, self).__init__(sys.stdout, sys.stderr)
self.ignore = ignore or [] self.ignore = ignore or []
self.ignored_warnings = 0
def flake(self, message): def flake(self, message):
classes = [error_mapping[i] for i in self.ignore if i in error_mapping] classes = [error_mapping[i] for i in self.ignore if i in error_mapping]
if (any(isinstance(message, c) for c in classes) or if (any(isinstance(message, c) for c in classes) or
skip_warning(message)): skip_warning(message)):
self.ignored_warnings += 1
return return
m = self.to_str(message) m = self.to_str(message)
i = m.rfind(':') + 1 i = m.rfind(':') + 1