diff --git a/plugin/autoformat.vim b/plugin/autoformat.vim index 1875aa3..ba04ed5 100644 --- a/plugin/autoformat.vim +++ b/plugin/autoformat.vim @@ -195,6 +195,7 @@ else: # It is not entirely clear when and why that happens. # However, extra newlines are almost never required, while there are linters that complain # about superfluous newlines, so we remove one empty newline at the end of the file. + stdoutdata = stdoutdata.decode('utf-8') if stdoutdata[-1] == os.linesep: stdoutdata = stdoutdata[:-1] diff --git a/plugin/defaults.vim b/plugin/defaults.vim index 11861de..9e5c6e9 100644 --- a/plugin/defaults.vim +++ b/plugin/defaults.vim @@ -4,12 +4,16 @@ " Python -if !exists('g:formatdef_autopep8') - let g:formatdef_autopep8 = '"autopep8 - --range ".a:firstline." ".a:lastline." ".(&textwidth ? "--max-line-length=".&textwidth : "")' +if !exists('g:formatdef_autopep8_1_0_3') + let g:formatdef_autopep8_1_0_3 = '"autopep8 - --range ".a:firstline." ".a:lastline." ".(&textwidth ? "--max-line-length=".&textwidth : "")' +endif + +if !exists('g:formatdef_autopep8_1_2_1') + let g:formatdef_autopep8_1_2_1 = '"autopep8 - --line-range ".a:firstline." ".a:lastline." ".(&textwidth ? "--max-line-length=".&textwidth : "")' endif if !exists('g:formatters_python') - let g:formatters_python = ['autopep8'] + let g:formatters_python = ['autopep8_1_0_3', 'autopep8_1_2_1'] endif