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

Merge branch 'local/pr/2'

Browse source 
Conflicts:
	flake8/hooks.py
This commit is contained in:
Ian Cordasco 2015-03-06 23:26:44 -06:00
commit 7ab30a747f
3 changed files with 46 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

22
flake8/hooks.py
View file

@ -6,7 +6,7 @@ import sys
import stat
from subprocess import Popen, PIPE
import shutil
from tempfile import mkdtemp
import tempfile
try:
from configparser import ConfigParser
except ImportError: # Python 2
@ -48,15 +48,10 @@ def git_hook(complexity=-1, strict=False, ignore=None, lazy=False):
if complexity > -1:
options['max_complexity'] = complexity
tmpdir = mkdtemp()
tmpdir = tempfile.mkdtemp()
flake8_style = get_style_guide(config_file=DEFAULT_CONFIG, paths=['.'],
**options)
# Since we use a temporary directory, the exclude path needs to be fixed
# to prepend that.
path_join = os.path.join
flake8_style.options.exclude = [path_join(tmpdir, x) if "/" in x else x
for x in flake8_style.options.exclude]
filepatterns = flake8_style.options.filename
# Copy staged versions to temporary directory
@ -74,15 +69,16 @@ def git_hook(complexity=-1, strict=False, ignore=None, lazy=False):
dirname = os.path.join(tmpdir, dirname)
if not os.path.isdir(dirname):
os.makedirs(dirname)
filename = os.path.join(dirname, filename)
# write staged version of file to temporary directory
with open(filename, "wb") as fh:
fh.write(out)
# check_files() only does this check if passed a dir; so we do it
if ((pep8.filename_match(filename, filepatterns) and
not flake8_style.excluded(filename))):
if ((pep8.filename_match(file_, filepatterns) and
not flake8_style.excluded(file_))):
filename = os.path.join(dirname, filename)
files_to_check.append(filename)
# write staged version of file to temporary directory
with open(filename, "wb") as fh:
fh.write(out)
# Run the checks
report = flake8_style.check_files(files_to_check)