pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-03-29 10:16:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #386 from pre-commit/line_endings_string_fixer

Browse source 
Fix crlf line endings for double-quote-string-fixer
This commit is contained in:
Anthony Sottile 2019-05-16 09:48:59 -07:00 • committed by GitHub
commit 24c5f07105
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pre_commit_hooks/string_fixer.py
View file

@ -31,13 +31,13 @@ def handle_match(token_text): # type: (str) -> str
def get_line_offsets_by_line_no(src): # type: (str) -> List[int]
# Padded so we can index with line number
offsets = [-1, 0]
for line in src.splitlines():
offsets.append(offsets[-1] + len(line) + 1)
for line in src.splitlines(True):
offsets.append(offsets[-1] + len(line))
return offsets
def fix_strings(filename): # type: (str) -> int
with io.open(filename, encoding='UTF-8') as f:
with io.open(filename, encoding='UTF-8', newline='') as f:
contents = f.read()
line_offsets = get_line_offsets_by_line_no(contents)
@ -58,8 +58,8 @@ def fix_strings(filename): # type: (str) -> int
new_contents = ''.join(splitcontents)
if contents != new_contents:
with io.open(filename, 'w', encoding='UTF-8') as write_handle:
write_handle.write(new_contents)
with io.open(filename, 'w', encoding='UTF-8', newline='') as f:
f.write(new_contents)
return 1
else:
return 0

9
tests/string_fixer_test.py
View file

@ -44,8 +44,15 @@ TESTS = (
@pytest.mark.parametrize(('input_s', 'output', 'expected_retval'), TESTS)
def test_rewrite(input_s, output, expected_retval, tmpdir):
path = tmpdir.join('file.txt')
path = tmpdir.join('file.py')
path.write(input_s)
retval = main([path.strpath])
assert path.read() == output
assert retval == expected_retval
def test_rewrite_crlf(tmpdir):
f = tmpdir.join('f.py')
f.write_binary(b'"foo"\r\n"bar"\r\n')
assert main((f.strpath,))
assert f.read_binary() == b"'foo'\r\n'bar'\r\n"