Merging 18 commit(s) from Chromium's toolchain-utils am: 0ae38c8498 am: 2a19d36a82 am: e617e3393dr_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-b-release

Change-Id: I3f25c7ee034b2e20e37ed941b8eae24eec7043eb

1 files changed, 8 insertions, 6 deletions

diff --git a/pgo_tools/merge_profdata_and_upload.py b/pgo_tools/merge_profdata_and_upload.py
index dddc7f1e..ea95289b 100755
--- a/pgo_tools/merge_profdata_and_upload.py
+++ b/pgo_tools/merge_profdata_and_upload.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # Copyright 2019 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -56,7 +56,8 @@ _LLVMMetadata = collections.namedtuple('_LLVMMetadata', ['head_sha'])
 def _get_gs_latest(remote_lastest):
   assert remote_lastest.startswith(_GS_PREFIX)
   try:
-    return subprocess.check_output(['gsutil', 'cat', remote_lastest])
+    return subprocess.check_output(['gsutil', 'cat', remote_lastest],
+                                   encoding='utf-8')
   except subprocess.CalledProcessError:
     raise RuntimeError('Lastest artifacts not found: %s' % remote_lastest)
 
@@ -142,7 +143,8 @@ def _tar_and_upload_profdata(profdata, name_suffix):
   print('Uploading tarball to gs.\nCMD: %s\n' % upload_cmd)
 
   # gsutil prints all status to stderr, oddly enough.
-  gs_output = subprocess.check_output(upload_cmd, stderr=subprocess.STDOUT)
+  gs_output = subprocess.check_output(
+      upload_cmd, stderr=subprocess.STDOUT, encoding='utf-8')
   print(gs_output)
 
   # gsutil exits successfully even if it uploaded nothing. It prints a summary
@@ -227,7 +229,7 @@ def main():
       for tryjob in args.tryjob:
         fetch_and_append_artifacts(tryjob)
 
-    assert heads, 'Didn\'t fetch anything?'
+    assert heads, "Didn't fetch anything?"
 
     def die_with_head_complaint(complaint):
       extra = ' (HEADs found: %s)' % sorted(heads)
@@ -239,7 +241,7 @@ def main():
         die_with_head_complaint(
             '%d LLVM HEADs were found, which is more than one. You probably '
             'want a consistent set of HEADs for a profile. If you know you '
-            'don\'t, please specify --llvm_hash, and note that *all* profiles '
+            "don't, please specify --llvm_hash, and note that *all* profiles "
             'will be merged into this final profile, regardless of their '
             'reported HEAD.' % len(heads))
       llvm_hash, = heads
@@ -247,7 +249,7 @@ def main():
     if llvm_hash not in heads:
       assert llvm_hash == args.llvm_hash
       die_with_head_complaint(
-          'HEAD %s wasn\'t found in any fetched artifacts.' % llvm_hash)
+          "HEAD %s wasn't found in any fetched artifacts." % llvm_hash)
 
     print('Using LLVM hash: %s' % llvm_hash)