commit fd18637072553f825bf2951d2ae9743724077199
author Rico Wind <ricow@google.com> Mon Feb 28 08:55:48 2022 +0100
committer Rico Wind <ricow@google.com> Mon Feb 28 08:00:01 2022 +0000
tree 9f40b35a572f64c1809c6bfabce6ca460883923f
parent 7804151e7349919034277056b46e09e8046d1f3c

Use decode('utf-8') for all subprocess calls

Bug: 221778256
Change-Id: Ib2029e5061193a62f3712baba99a395f4340ba86

tools/archive.py

diff --git a/tools/archive.py b/tools/archive.py
index 6eada3d..d3aa196 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -35,9 +35,9 @@
 
 def GetToolVersion(jar_path):
   # TODO(mkroghj) This would not work for r8-lib, maybe use utils.getR8Version.
-  output = str(subprocess.check_output([
+  output = subprocess.check_output([
     jdk.GetJavaExecutable(), '-jar', jar_path, '--version'
-  ]))
+  ]).decode('utf-8')
   return output.splitlines()[0].strip()
 
 def GetVersion():
@@ -54,11 +54,11 @@
   return subprocess.check_output(['git', 'show', '-s', '--pretty=%d', 'HEAD'])
 
 def GetGitHash():
-  return str(subprocess.check_output(['git', 'rev-parse', 'HEAD'])).strip()
+  return subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode('utf-8').strip()
 
 def IsMain(version):
-  branches = str(subprocess.check_output(['git', 'branch', '-r', '--contains',
-                                      'HEAD']))
+  branches = subprocess.check_output(['git', 'branch', '-r', '--contains',
+                                      'HEAD']).decode('utf-8')
   # CL runs from gerrit does not have a branch, we always treat them as main
   # commits to archive these to the hash based location
   if len(branches) == 0: