From dcdf2713f610cb3cfaa615ab9b8d4b9412e7a8b6 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 9 Jul 2020 10:36:06 -0400 Subject: Python3-related fixes in some of our scripts Change-Id: I8acbe43e3f27e51159a7a78fcc361476d7406cbb --- utils/analysis/objdiff.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'utils/analysis/objdiff.py') diff --git a/utils/analysis/objdiff.py b/utils/analysis/objdiff.py index dc51441bfa..29f703e52a 100755 --- a/utils/analysis/objdiff.py +++ b/utils/analysis/objdiff.py @@ -3,10 +3,10 @@ import sys from subprocess import Popen, PIPE if len(sys.argv) != 3: - print """%s usage: + print ("""%s usage: %s obj1 obj2 Calculate per-symbol and total size differences between obj1 and obj2, - which may be any files that nm can read""" % ((sys.argv[0],)*2) + which may be any files that nm can read""" % ((sys.argv[0],)*2)) sys.exit(2) obj1 = sys.argv[1] @@ -16,8 +16,8 @@ def getsyms(obj): proc = Popen(args=['nm', '-S', '-t', 'd', obj], stdout=PIPE, stderr=PIPE) out, err = proc.communicate() if err: - print "nm reported an error:\n" - print err + print ("nm reported an error:\n") + print (err) sys.exit(1) d = {} for l in out.splitlines(): @@ -32,23 +32,23 @@ d1 = getsyms(obj1) d2 = getsyms(obj2) l = [(k,v) for k,v in sorted(d1.items()) if k not in d2] if l: - print "only in %s" % obj1 - print ''.join(" %6d %s\n" % (v,k) for k,v in l) + print ("only in %s" % obj1) + print (''.join(" %6d %s\n" % (v,k)) for k,v in l) diff -= sum(v for k,v in l) l = [(k,v) for k,v in sorted(d2.items()) if k not in d1] if l: - print "only in %s" % obj2 - print ''.join("%6d %s\n" % (v,k) for k,v in l) + print ("only in %s" % obj2) + print (''.join("%6d %s\n" % (v,k)) for k,v in l) diff += sum(v for k,v in l) l = [(k,v,d2[k]) for k,v in sorted(d1.items()) if k in d2 and d2[k] != v] if l: - print "different sizes in %s and %s:" %(obj1, obj2) - print ''.join(" %6d %6d %s\n" % (v1,v2,k) for k,v1,v2 in l) + print ("different sizes in %s and %s:" %(obj1, obj2)) + print (''.join(" %6d %6d %s\n" % (v1,v2,k)) for k,v1,v2 in l) diff += sum(v2-v1 for k,v1,v2 in l) if diff: - print "total size difference: %+d" % diff + print ("total size difference: %+d" % diff) else: - print "total size difference: 0" + print ("total size difference: 0") -- cgit v1.2.3