pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-10 13:24:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change parameter name to "chars" and move encoding outside loop

Browse source
This commit is contained in:
iconmaster5326 2019-10-25 12:20:04 -04:00
parent dcbf43489c
commit a33a8f0d8a
1 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pre_commit_hooks/trailing_whitespace_fixer.py
View file

@ -7,15 +7,11 @@ from typing import Optional
from typing import Sequence from typing import Sequence
def _fix_file(filename, is_markdown, chars_to_strip): def _fix_file(filename, is_markdown, chars):
# type: (str, bool, Optional[bytes]) -> bool # type: (str, bool, Optional[bytes]) -> bool
with open(filename, mode='rb') as file_processed: with open(filename, mode='rb') as file_processed:
lines = file_processed.readlines() lines = file_processed.readlines()
newlines = [ newlines = [_process_line(line, is_markdown, chars) for line in lines]
_process_line(line, is_markdown, chars_to_strip)
for line
in lines
]
if newlines != lines: if newlines != lines:
with open(filename, mode='wb') as file_processed: with open(filename, mode='wb') as file_processed:
for line in newlines: for line in newlines:
@ -25,7 +21,7 @@ def _fix_file(filename, is_markdown, chars_to_strip):
return False return False
def _process_line(line, is_markdown, chars_to_strip): def _process_line(line, is_markdown, chars):
# type: (bytes, bool, Optional[bytes]) -> bytes # type: (bytes, bool, Optional[bytes]) -> bytes
if line[-2:] == b'\r\n': if line[-2:] == b'\r\n':
eol = b'\r\n' eol = b'\r\n'
@ -37,8 +33,8 @@ def _process_line(line, is_markdown, chars_to_strip):
eol = b'' eol = b''
# preserve trailing two-space for non-blank lines in markdown files # preserve trailing two-space for non-blank lines in markdown files
if is_markdown and (not line.isspace()) and line.endswith(b' '): if is_markdown and (not line.isspace()) and line.endswith(b' '):
return line[:-2].rstrip(chars_to_strip) + b' ' + eol return line[:-2].rstrip(chars) + b' ' + eol
return line.rstrip(chars_to_strip) + eol return line.rstrip(chars) + eol
def main(argv=None): # type: (Optional[Sequence[str]]) -> int def main(argv=None): # type: (Optional[Sequence[str]]) -> int
@ -60,8 +56,10 @@ def main(argv=None): # type: (Optional[Sequence[str]]) -> int
) )
parser.add_argument( parser.add_argument(
'--chars', '--chars',
help='The set of characters to strip from the end of lines. ' help=(
'Defaults to all whitespace characters.', 'The set of characters to strip from the end of lines. '
'Defaults to all whitespace characters.'
),
) )
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)
@ -86,16 +84,12 @@ def main(argv=None): # type: (Optional[Sequence[str]]) -> int
" (probably filename; use '--markdown-linebreak-ext=EXT')" " (probably filename; use '--markdown-linebreak-ext=EXT')"
.format(ext), .format(ext),
) )
chars = None if args.chars is None else args.chars.encode('utf-8')
return_code = 0 return_code = 0
for filename in args.filenames: for filename in args.filenames:
_, extension = os.path.splitext(filename.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( if _fix_file(filename, md, chars):
filename,
md,
None if args.chars is None else args.chars.encode('utf-8'),
):
print('Fixing {}'.format(filename)) print('Fixing {}'.format(filename))
return_code = 1 return_code = 1
return return_code return return_code