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

Correct usage config_file StyleGuide parameter

Browse source 
Previously, we passed the location for our user config file to the
StyleGuide. This was intended to be a way to tell pep8's StyleGuide
to use that as a user config file, but instead that became the default
for the --config command-line option. This caused that to have higher
priority than the project configuration file.

Closes #122
This commit is contained in:
Ian Cordasco 2016-02-17 20:47:45 -06:00
parent b25ad979a6
commit 533d222f52
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake8/hooks.py
View file

@ -14,7 +14,6 @@ except ImportError: # Python 2
from flake8 import compat
from flake8.engine import get_parser, get_style_guide
from flake8.main import DEFAULT_CONFIG
def git_hook(complexity=-1, strict=False, ignore=None, lazy=False):
@ -51,8 +50,7 @@ def git_hook(complexity=-1, strict=False, ignore=None, lazy=False):
tmpdir = tempfile.mkdtemp()
flake8_style = get_style_guide(config_file=DEFAULT_CONFIG, paths=['.'],
**options)
flake8_style = get_style_guide(paths=['.'], **options)
filepatterns = flake8_style.options.filename
# Copy staged versions to temporary directory
@ -102,7 +100,7 @@ def hg_hook(ui, repo, **kwargs):
complexity = ui.config('flake8', 'complexity', default=-1)
strict = ui.configbool('flake8', 'strict', default=True)
ignore = ui.config('flake8', 'ignore', default=None)
config = ui.config('flake8', 'config', default=DEFAULT_CONFIG)
config = ui.config('flake8', 'config', default=None)
paths = _get_files(repo, **kwargs)