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

Merge in @tarek's changes.

Browse source
This commit is contained in:
Ian Cordasco 2012-11-07 20:33:04 -05:00
commit cc1d7c5385
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
flake8/run.py
View file

@ -54,14 +54,9 @@ def _get_python_files(paths):
yield path yield path
def init(parse_argv=False, config_file=True, **kwargs):
global pep8style
pep8style = pep8.StyleGuide(parse_argv=parse_argv,
config_file=config_file)
def main(): def main():
init(True) global pep8style
pep8style = pep8.StyleGuide(parse_argv=True, config_file=True)
options = pep8style.options options = pep8style.options
complexity = options.max_complexity complexity = options.max_complexity
builtins = set(options.builtins) builtins = set(options.builtins)
@ -126,6 +121,9 @@ class _PEP8Options(object):
def _initpep8(): def _initpep8():
# default pep8 setup # default pep8 setup
global pep8style
if pep8style is None:
pep8style = pep8.StyleGuide(config_file=True)
pep8.options = _PEP8Options() pep8.options = _PEP8Options()
pep8.options.physical_checks = pep8.find_checks('physical_line') pep8.options.physical_checks = pep8.find_checks('physical_line')
pep8.options.logical_checks = pep8.find_checks('logical_line') pep8.options.logical_checks = pep8.find_checks('logical_line')
@ -143,7 +141,6 @@ def run(command):
def git_hook(complexity=-1, strict=False, ignore=None): def git_hook(complexity=-1, strict=False, ignore=None):
init()
_initpep8() _initpep8()
if ignore: if ignore:
pep8.options.ignore = ignore pep8.options.ignore = ignore
@ -206,8 +203,6 @@ else:
yield "%s.py" % filename yield "%s.py" % filename
def run(self): def run(self):
init()
_initpep8() _initpep8()
# _get_python_files can produce the same file several # _get_python_files can produce the same file several