Merge branch 'isort-fix' into 'master'

fix for flake8-isort

See merge request pycqa/flake8!215
This commit is contained in:
Ian Stapleton Cordasco 2018-01-01 00:53:56 +00:00
commit 0c7de6df55

View file

@ -132,6 +132,12 @@ def find_git_directory():
def copy_indexed_files_to(temporary_directory, lazy):
# some plugins (e.g. flake8-isort) need these files to run their checks
setup_cfgs = find_setup_cfgs(lazy)
for filename in setup_cfgs:
contents = get_staged_contents_from(filename)
copy_file_to(temporary_directory, filename, contents)
modified_files = find_modified_files(lazy)
for filename in modified_files:
contents = get_staged_contents_from(filename)
@ -170,6 +176,18 @@ def find_modified_files(lazy):
return stdout.splitlines()
def find_setup_cfgs(lazy):
setup_cfg_cmd = [
'git', 'ls-files', '--cached', '*setup.cfg'
]
if lazy:
setup_cfg_cmd.remove('--cached')
extra_files = piped_process(setup_cfg_cmd)
(stdout, _) = extra_files.communicate()
stdout = to_text(stdout)
return stdout.splitlines()
def get_staged_contents_from(filename):
git_show = piped_process(['git', 'show', ':{0}'.format(filename)])
(stdout, _) = git_show.communicate()