[clang-format] Use utf-8 for JSON object load

[kaitingwang]

Summary

From Python 3.6 and above, it should be able to automatically select a decoding for the json.loads. However, with a vim encoding that defaults to utf-8, the clang-format.py runs into the following error. The patch explicit specifies to use use utf-8 decoding for header.

Traceback (most recent call last):

File "<string>", line 1, in <module>
File "/home/k00375917/sycl_workspace/llvm/clang/tools/clang-format/clang-format.py", line 156, in <module>
  main()
File "/home/k00375917/sycl_workspace/llvm/clang/tools/clang-format/clang-format.py", line 137, in main
  header = json.loads(header)
File "/usr/lib/python3.5/json/__init__.py", line 312, in loads
  s.__class__.__name__))

TypeError: the JSON object must be str, not 'bytes'

[sammccall]

Thanks!

[ldrumm]

LGTM

[ldrumm]

Do you have commit access?

[kaitingwang]

In D133236#3769784, @ldrumm wrote:

Do you have commit access?

@ldrumm I don't have commit access. Would you commit for me? Really appreciate it!

clang/tools/clang-format/clang-format.py

 # This file is a minimal clang-format vim-integration. To install:
 # - Change 'binary' if clang-format is not on the path (see below).
 # - Add to your .vimrc:
 #
 #   if has('python')
 #     map <C-I> :pyf <path-to-this-file>/clang-format.py<cr>
 #     imap <C-I> <c-o>:pyf <path-to-this-file>/clang-format.py<cr>
 #   elseif has('python3')
 #     map <C-I> :py3f <path-to-this-file>/clang-format.py<cr>
 #     imap <C-I> <c-o>:py3f <path-to-this-file>/clang-format.py<cr>
 #   endif
 #
-# The if-elseif-endif conditional should pick either the python3 or python2 
+# The if-elseif-endif conditional should pick either the python3 or python2
 # integration depending on your vim setup.
-# 
+#
 # The first mapping enables clang-format for NORMAL and VISUAL mode, the second
 # mapping adds support for INSERT mode. Change "C-I" to another binding if you
 # need clang-format on a different key (C-I stands for Ctrl+i).
 #
 # With this integration you can press the bound key and clang-format will
 # format the current line in NORMAL and INSERT mode or the selected region in
 # VISUAL mode. The line or region is extended to the next bigger syntactic
 # entity.
def main():
 
   if not stdout:
     print(
         'No output from clang-format (crashed?).\n'
         'Please report to bugs.llvm.org.'
     )
   else:
     header, content = stdout.split(b'\n', 1)
-    header = json.loads(header)
+    header = json.loads(header.decode('utf-8'))
     # Strip off the trailing newline (added above).
     # This maintains trailing empty lines present in the buffer if
     # the -lines specification requests them to remain unchanged.
     lines = content.decode(encoding).split('\n')[:-1]
     sequence = difflib.SequenceMatcher(None, buf, lines)
     for op in reversed(sequence.get_opcodes()):
       if op[0] != 'equal':
         vim.current.buffer[op[1]:op[2]] = lines[op[3]:op[4]]