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, 7 insertions, 7 deletions

diff --git a/chromiumos_image_diff.py b/chromiumos_image_diff.py
index 74906d32..66a54ccc 100755
--- a/chromiumos_image_diff.py
+++ b/chromiumos_image_diff.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.
@@ -86,7 +86,7 @@ class CrosImage(object):
                '{r}/var {r}/mnt/stateful_partition {r}; sudo umount {s} ; '
                'rmdir {r} ; rmdir {s}\n').format(
                    r=self.rootfs, s=self.stateful)
-    f = open(self.unmount_script, 'w')
+    f = open(self.unmount_script, 'w', encoding='utf-8')
     f.write(command)
     f.close()
     self._ce.RunCommand(
@@ -160,9 +160,9 @@ class ImageComparator(object):
     i1 = self.images[0]
     i2 = self.images[1]
     t1 = i1.rootfs + '/'
-    elfset1 = set([e.replace(t1, '') for e in i1.elf_files])
+    elfset1 = {e.replace(t1, '') for e in i1.elf_files}
     t2 = i2.rootfs + '/'
-    elfset2 = set([e.replace(t2, '') for e in i2.elf_files])
+    elfset2 = {e.replace(t2, '') for e in i2.elf_files}
     dif1 = elfset1.difference(elfset2)
     msg = None
     if dif1:
@@ -210,15 +210,15 @@ class ImageComparator(object):
 
       if full_path1 == full_path2:
         self.logger.LogError(
-            'Error:  We\'re comparing the SAME file - {0}'.format(f1))
+            "Error:  We're comparing the SAME file - {0}".format(f1))
         continue
 
       command = (
           'objdump -d "{f1}" > {tempf1} ; '
           'objdump -d "{f2}" > {tempf2} ; '
           # Remove path string inside the dissemble
-          'sed -i \'s!{rootfs1}!!g\' {tempf1} ; '
-          'sed -i \'s!{rootfs2}!!g\' {tempf2} ; '
+          "sed -i 's!{rootfs1}!!g' {tempf1} ; "
+          "sed -i 's!{rootfs2}!!g' {tempf2} ; "
           'diff {tempf1} {tempf2} 1>/dev/null 2>&1').format(
               f1=full_path1,
               f2=full_path2,