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

Merge pull request #242 from pre-commit/fix_trailing_whitespace_non_utf8_osx

Browse source 
Fix trailing-whitespace on macos for non-utf8 files
This commit is contained in:
Anthony Sottile 2017-10-09 10:59:27 -07:00 • committed by GitHub
commit 7f0d6274b5
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pre_commit_hooks/trailing_whitespace_fixer.py
View file

@ -4,8 +4,6 @@ import argparse
import os import os
import sys import sys
from pre_commit_hooks.util import cmd_output
def _fix_file(filename, is_markdown): def _fix_file(filename, is_markdown):
with open(filename, mode='rb') as file_processed: with open(filename, mode='rb') as file_processed:
@ -50,10 +48,6 @@ def fix_trailing_whitespace(argv=None):
parser.add_argument('filenames', nargs='*', help='Filenames to fix') parser.add_argument('filenames', nargs='*', help='Filenames to fix')
args = parser.parse_args(argv) args = parser.parse_args(argv)
bad_whitespace_files = cmd_output(
'grep', '-l', '[[:space:]]$', *args.filenames, retcode=None
).strip().splitlines()
md_args = args.markdown_linebreak_ext md_args = args.markdown_linebreak_ext
if '' in md_args: if '' in md_args:
parser.error('--markdown-linebreak-ext requires a non-empty argument') parser.error('--markdown-linebreak-ext requires a non-empty argument')
@ -73,11 +67,11 @@ def fix_trailing_whitespace(argv=None):
) )
return_code = 0 return_code = 0
for bad_whitespace_file in bad_whitespace_files: for filename in args.filenames:
_, extension = os.path.splitext(bad_whitespace_file.lower()) _, extension = os.path.splitext(filename.lower())
md = all_markdown or extension in md_exts md = all_markdown or extension in md_exts
if _fix_file(bad_whitespace_file, md): if _fix_file(filename, md):
print('Fixing {}'.format(bad_whitespace_file)) print('Fixing {}'.format(filename))
return_code = 1 return_code = 1
return return_code return return_code