[PATCH] D51220: [clang-tidy] run-clang-tidy fails using python 3.7

[Andi via Phabricator via cfe-commits]

Abpostelnicu updated this revision to Diff 162391.

https://reviews.llvm.org/D51220

Files:
  clang-tidy/tool/run-clang-tidy.py


Index: clang-tidy/tool/run-clang-tidy.py
===================================================================
--- clang-tidy/tool/run-clang-tidy.py
+++ clang-tidy/tool/run-clang-tidy.py
@@ -166,18 +166,10 @@
     output, err = proc.communicate()
     if proc.returncode != 0:
       failed_files.append(name)
-
-    if is_py2:
-      output_string = output
-      err_string = err
-    else:
-      output_string = str(output, 'utf-8')
-      err_string = str(err, 'utf-8')
-
     with lock:
-      sys.stdout.write(' '.join(invocation) + '\n' + output_string + '\n')
+      sys.stdout.write(' '.join(invocation) + '\n' + output.decode('utf-8') + 
'\n')
       if err:
-        sys.stderr.write(err_string + '\n')
+        sys.stderr.write(err.decode('utf-8') + '\n')
     queue.task_done()
 
 



Index: clang-tidy/tool/run-clang-tidy.py
===================================================================
--- clang-tidy/tool/run-clang-tidy.py
+++ clang-tidy/tool/run-clang-tidy.py
@@ -166,18 +166,10 @@
     output, err = proc.communicate()
     if proc.returncode != 0:
       failed_files.append(name)
-
-    if is_py2:
-      output_string = output
-      err_string = err
-    else:
-      output_string = str(output, 'utf-8')
-      err_string = str(err, 'utf-8')
-
     with lock:
-      sys.stdout.write(' '.join(invocation) + '\n' + output_string + '\n')
+      sys.stdout.write(' '.join(invocation) + '\n' + output.decode('utf-8') + '\n')
       if err:
-        sys.stderr.write(err_string + '\n')
+        sys.stderr.write(err.decode('utf-8') + '\n')
     queue.task_done()
 
 

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits