vim/vim-autoformat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix python3 support.

Browse Source
This commit is contained in:
Chiel ten Brinke 2015-10-29 12:22:48 +01:00
parent e6ecfff004
commit 735d709e84
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/autoformat.vim
View File

@ -191,6 +191,8 @@ if stderrdata:
print('Failing config: {} '.format(repr(formatprg), stderrdata)) print('Failing config: {} '.format(repr(formatprg), stderrdata))
vim.command('return 0') vim.command('return 0')
else: else:
stdoutdata = stdoutdata.decode('utf-8')
# Often shell commands will append a newline at the end of their output. # Often shell commands will append a newline at the end of their output.
# It is not entirely clear when and why that happens. # It is not entirely clear when and why that happens.
# However, extra newlines are almost never required, while there are linters that complain # However, extra newlines are almost never required, while there are linters that complain
@ -198,12 +200,10 @@ else:
if stdoutdata[-1] == os.linesep: if stdoutdata[-1] == os.linesep:
stdoutdata = stdoutdata[:-1] stdoutdata = stdoutdata[:-1]
stdoutdata = stdoutdata.decode('utf-8')
# It is not certain what kind of line endings are being used by the format program. # It is not certain what kind of line endings are being used by the format program.
# Therefore we simply split on all possible eol characters. # Therefore we simply split on all possible eol characters.
lines = [stdoutdata] lines = [stdoutdata]
for eol in [b'\r\n', b'\r', b'\n', os.linesep.decode('utf-8')]: for eol in ['\r\n', '\r', '\n', os.linesep]:
lines = [splitline for line in lines for splitline in line.split(eol)] lines = [splitline for line in lines for splitline in line.split(eol)]
vim.current.buffer[:] = lines vim.current.buffer[:] = lines