tools: Use Python 3 style print statements [9/9]

Initial conversion performed using '2to3 -f print .'.
Imports added and duplicate parentheses removed manually.
Manually converted files, comments and inline code that 2to3 missed.
Afterwards ran "git cl format --python" and cherry-picked the formatting changes.

There are no intended behavioural changes.

Bug: 941669
Change-Id: Ib7b47c4294679b5091faf4b56486cd5946f78377
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1818520
Commit-Queue: Raul Tambre <raul@tambre.ee>
Auto-Submit: Raul Tambre <raul@tambre.ee>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700582}

tools/translation/helper/translation_helper.py

@@ -4,6 +4,8 @@
 
 """Helpers for dealing with translation files."""
 
+from __future__ import print_function
+
 import ast
 import os
 import re
@@ -236,5 +238,5 @@ def _parse_translation_expectations(path):
     return grd_to_langs, untranslated_grds, internal_grds
 
   except Exception:
-    print 'Error: failed to parse', path
+    print('Error: failed to parse', path)
     raise

tools/translation/upload_screenshots.py

@@ -16,6 +16,8 @@ files, so it doesn't know whether an image file corresponds to a message or not.
 It will attempt to upload the image anyways.
 """
 
+from __future__ import print_function
+
 import argparse
 import sys
 import os
@@ -71,14 +73,14 @@ def query_yes_no(question, default='no'):
 
   valid = {'yes': True, 'y': True, 'ye': True, 'no': False, 'n': False}
   while True:
-    print question, prompt
+    print(question, prompt)
     choice = raw_input().lower()
     if default is not None and choice == '':
       return valid[default]
     elif choice in valid:
       return valid[choice]
     else:
-      print "Please respond with 'yes' or 'no' (or 'y' or 'n')."
+      print("Please respond with 'yes' or 'no' (or 'y' or 'n').")
 
 
 def list_grds_in_repository(repo_path):
@@ -134,7 +136,7 @@ def find_screenshots(repo_root, translation_expectations):
       if f in ('OWNERS', 'README.md') or f.endswith('.sha1'):
         continue
       if not f.endswith('.png'):
-        print 'File with unexpected extension: %s in %s' % (f, screenshots_dir)
+        print('File with unexpected extension: %s in %s' % (f, screenshots_dir))
         continue
       screenshots.append(os.path.join(screenshots_dir, f))
   return screenshots
@@ -162,10 +164,10 @@ def main():
            "this script can pick up its screenshot directory.")
     exit(0)
 
-  print 'Found %d updated screenshot(s): ' % len(screenshots)
+  print('Found %d updated screenshot(s): ' % len(screenshots))
   for s in screenshots:
-    print '  %s' % s
-  print
+    print('  %s' % s)
+  print()
   if not query_yes_no(
       'Do you want to upload these to Google Cloud Storage?\n\n'
       'FILES WILL BE PUBLIC, DO NOT UPLOAD ANYTHING CONFIDENTIAL.'):
@@ -190,13 +192,13 @@ def main():
              '`download_from_google_storage --config`.')
       exit(1)
 
-  print
-  print 'Images are uploaded and their signatures are calculated:'
+  print()
+  print('Images are uploaded and their signatures are calculated:')
 
   signatures = ['%s.sha1' % s for s in screenshots]
   for s in signatures:
-    print '  %s' % s
-  print
+    print('  %s' % s)
+  print()
 
   # Always ask if the .sha1 files should be added to the CL, even if they are
   # already part of the CL. If the files are not modified, adding again is a
@@ -208,7 +210,7 @@ def main():
   if not args.dry_run:
     git_add(signatures, src_path)
 
-  print 'DONE.'
+  print('DONE.')
 
 
 if __name__ == '__main__':

tools/unused-symbols-report.py

@@ -17,6 +17,8 @@ and run this script on it:
   ./tools/unused-symbols-report.py buildlog > report.html
 """
 
+from __future__ import print_function
+
 import cgi
 import optparse
 import os
@@ -31,7 +33,7 @@ def Demangle(sym):
   if cppfilt_proc is None:
     cppfilt_proc = subprocess.Popen(['c++filt'], stdin=subprocess.PIPE,
                                     stdout=subprocess.PIPE)
-  print >>cppfilt_proc.stdin, sym
+  print(sym, file=cppfilt_proc.stdin)
   return cppfilt_proc.stdout.readline().strip()
 
 
@@ -73,7 +75,7 @@ def Parse(input, skip_paths=None, only_paths=None):
       continue
     match = path_re.match(path)
     if not match:
-      print >>sys.stderr, "Skipping weird path", path
+      print("Skipping weird path", path, file=sys.stderr)
       continue
     target, path = match.groups()
     yield target, path, symbol
@@ -130,23 +132,23 @@ def Output(iter):
     entries = targets.setdefault(target, [])
     entries.append((symbol, path))
 
-  print TEMPLATE_HEADER
-  print "<p>jump to target:"
-  print "<select onchange='document.location.hash = this.value'>"
+  print(TEMPLATE_HEADER)
+  print("<p>jump to target:")
+  print("<select onchange='document.location.hash = this.value'>")
   for target in sorted(targets.keys()):
-    print "<option>%s</option>" % target
-  print "</select></p>"
+    print("<option>%s</option>" % target)
+  print("</select></p>")
 
   for target in sorted(targets.keys()):
-    print "<h2>%s" % target
-    print "<a class=permalink href='#%s' name='%s'>#</a>" % (target, target)
-    print "</h2>"
-    print "<table width=100% cellspacing=0>"
+    print("<h2>%s" % target)
+    print("<a class=permalink href='#%s' name='%s'>#</a>" % (target, target))
+    print("</h2>")
+    print("<table width=100% cellspacing=0>")
     for symbol, path in sorted(targets[target]):
       htmlsymbol = cgi.escape(symbol).replace('::', '::<wbr>')
-      print "<tr><td><div class=symbol>%s</div></td>" % htmlsymbol
-      print "<td valign=top><div class=file>%s</div></td></tr>" % path
-    print "</table>"
+      print("<tr><td><div class=symbol>%s</div></td>" % htmlsymbol)
+      print("<td valign=top><div class=file>%s</div></td></tr>" % path)
+    print("</table>")
 
 
 def main():

tools/usb_gadget/__main__.py

@@ -4,6 +4,8 @@
 
 """Package entry-point."""
 
+from __future__ import print_function
+
 import argparse
 
 import netifaces
@@ -60,7 +62,7 @@ def main():
   server.http_server.listen(server.port)
 
   ioloop.IOLoop.instance().start()
-  print 'Exiting...'
+  print('Exiting...')
 
 
 if __name__ == '__main__':

tools/usb_gadget/gadget.py

@@ -5,6 +5,8 @@
 """Generic USB gadget functionality.
 """
 
+from __future__ import print_function
+
 import struct
 
 import msos20_descriptors
@@ -266,8 +268,8 @@ class Gadget(object):
         desc_index = value & 0xff
         desc_lang = index
 
-        print 'GetDescriptor(recipient={}, type={}, index={}, lang={})'.format(
-            recipient, desc_type, desc_index, desc_lang)
+        print('GetDescriptor(recipient={}, type={}, index={}, lang={})'.format(
+            recipient, desc_type, desc_index, desc_lang))
 
         return self.GetDescriptor(recipient, desc_type, desc_index, desc_lang,
                                   length)
@@ -519,7 +521,7 @@ class Gadget(object):
     Returns:
       True on success, None on error to stall the pipe.
     """
-    print 'SetConfiguration({})'.format(index)
+    print('SetConfiguration({})'.format(index))
 
     for endpoint_addrs in self._active_endpoints.values():
       for endpoint_addr in endpoint_addrs:
@@ -559,7 +561,7 @@ class Gadget(object):
     Returns:
       True on success, None on error to stall the pipe.
     """
-    print 'SetInterface({}, {})'.format(interface, alt_setting)
+    print('SetInterface({}, {})'.format(interface, alt_setting))
 
     config_desc = self.GetConfigurationDescriptor()
     interface_desc = None

tools/usb_gadget/hid_gadget.py

@@ -10,6 +10,8 @@ own Report ID and will be called upon to answer get/set input/output/feature
 report requests as necessary.
 """
 
+from __future__ import print_function
+
 import math
 import struct
 import uuid
@@ -157,8 +159,8 @@ class HidCompositeFeature(composite_gadget.CompositeFeature):
 
     if request == hid_constants.Request.GET_REPORT:
       report_type, report_id = value >> 8, value & 0xFF
-      print ('GetReport(type={}, id={}, length={})'
-             .format(report_type, report_id, length))
+      print('GetReport(type={}, id={}, length={})'.format(
+          report_type, report_id, length))
       return self.GetReport(report_type, report_id, length)
 
   def ClassControlWrite(self, recipient, request, value, index, data):

tools/usb_gadget/linux_gadgetfs.py

@@ -10,6 +10,8 @@ ABI is documented here:
 https://github.com/torvalds/linux/blob/master/drivers/usb/gadget/inode.c
 """
 
+from __future__ import print_function
+
 import errno
 import multiprocessing
 import os
@@ -124,7 +126,7 @@ class LinuxGadgetfs(object):
     event_type, = struct.unpack_from('=I', buf, 8)
 
     if event_type == GADGETFS_NOP:
-      print 'NOP'
+      print('NOP')
     elif event_type == GADGETFS_CONNECT:
       speed, = struct.unpack('=Ixxxxxxxx', buf)
       self.Connected(speed)
@@ -135,31 +137,31 @@ class LinuxGadgetfs(object):
           '<BBHHHxxxx', buf)
       self.HandleSetup(request_type, request, value, index, length)
     elif event_type == GADGETFS_SUSPEND:
-      print 'SUSPEND'
+      print('SUSPEND')
     else:
-      print 'Unknown gadgetfs event type:', event_type
+      print('Unknown gadgetfs event type:', event_type)
 
   def Connected(self, speed):
-    print 'CONNECT speed={}'.format(speed)
+    print('CONNECT speed={}'.format(speed))
     self._gadget.Connected(self, speed)
 
   def Disconnected(self):
-    print 'DISCONNECT'
+    print('DISCONNECT')
     for endpoint_addr in self._ep_fds.keys():
       self.StopEndpoint(endpoint_addr)
     self._ep_fds.clear()
     self._gadget.Disconnected()
 
   def HandleSetup(self, request_type, request, value, index, length):
-    print ('SETUP bmRequestType=0x{:02X} bRequest=0x{:02X} wValue=0x{:04X} '
-           'wIndex=0x{:04X} wLength={}'
-           .format(request_type, request, value, index, length))
+    print('SETUP bmRequestType=0x{:02X} bRequest=0x{:02X} wValue=0x{:04X} '
+          'wIndex=0x{:04X} wLength={}'.format(request_type, request, value,
+                                              index, length))
 
     if request_type & usb_constants.Dir.IN:
       data = self._gadget.ControlRead(
           request_type, request, value, index, length)
       if data is None:
-        print 'SETUP STALL'
+        print('SETUP STALL')
         try:
           os.read(self._fd, 0)  # Backwards I/O stalls the pipe.
         except OSError, e:
@@ -175,7 +177,7 @@ class LinuxGadgetfs(object):
       result = self._gadget.ControlWrite(
           request_type, request, value, index, data)
       if result is None:
-        print 'SETUP STALL'
+        print('SETUP STALL')
         try:
           os.write(self._fd, '')  # Backwards I/O stalls the pipe.
         except OSError, e:
@@ -269,7 +271,7 @@ class LinuxGadgetfs(object):
       self._ep_fds[endpoint_addr] = fd, child, pipe_r
 
     child.start()
-    print 'Started endpoint 0x{:02X}.'.format(endpoint_addr)
+    print('Started endpoint 0x{:02X}.'.format(endpoint_addr))
 
   def StopEndpoint(self, endpoint_addr):
     """Deactivate the given endpoint."""
@@ -280,7 +282,7 @@ class LinuxGadgetfs(object):
     if not endpoint_addr & usb_constants.Dir.IN:
       self._io_loop.remove_handler(pipe_fd)
     os.close(fd)
-    print 'Stopped endpoint 0x{:02X}.'.format(endpoint_addr)
+    print('Stopped endpoint 0x{:02X}.'.format(endpoint_addr))
 
   def SendPacket(self, endpoint_addr, data):
     """Send a packet on the given endpoint."""

tools/usb_gadget/server.py

@@ -5,6 +5,8 @@
 """WSGI application to manage a USB gadget.
 """
 
+from __future__ import print_function
+
 import datetime
 import hashlib
 import re
@@ -83,7 +85,7 @@ class UpdateHandler(web.RequestHandler):
     if claimed_by is not None:
       args.extend(['--start-claimed', claimed_by])
 
-    print 'Reloading with version {}...'.format(md5sum)
+    print('Reloading with version {}...'.format(md5sum))
 
     global http_server
     if chip.IsConfigured():

tools/variations/bisect_variations.py

@@ -24,6 +24,8 @@ chrome://version/?show-variations-cmd.
 Run with --help to get a complete list of options this script runs with.
 """
 
+from __future__ import print_function
+
 import logging
 import optparse
 import os
@@ -248,7 +250,7 @@ def Bisect(browser_type, url, extra_browser_args, variations_file, output_dir):
   runs = [variations_file]
   while runs:
     run = runs[0]
-    print 'Run Chrome with variations file', run
+    print('Run Chrome with variations file', run)
     variations_args = _LoadVariations(run)
     exit_status, stdout, stderr = _RunVariations(
         browser_path=browser_path, url=url,
@@ -260,7 +262,7 @@ def Bisect(browser_type, url, extra_browser_args, variations_file, output_dir):
       runs = split_variations_cmd.SplitVariationsCmdFromFile(run, output_dir)
       if len(runs) == 1:
         # Can divide no further.
-        print 'Bisecting succeeded:', ' '.join(variations_args)
+        print('Bisecting succeeded:', ' '.join(variations_args))
         return
     elif answer == 'n':
       if len(runs) == 1:

tools/variations/fieldtrial_util.py

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 import json
 import sys
 
@@ -78,11 +80,11 @@ def GenerateArgs(config_path, platforms):
         param_list.append(param['key'])
         param_list.append(param['value'])
     if len(param_list):
-       # Escape the variables for the command-line.
-       selected_study = [_escape(x) for x in selected_study]
-       param_list = [_escape(x) for x in param_list]
-       param = '%s:%s' % ('.'.join(selected_study), '/'.join(param_list))
-       params.append(param)
+      # Escape the variables for the command-line.
+      selected_study = [_escape(x) for x in selected_study]
+      param_list = [_escape(x) for x in param_list]
+      param = '%s:%s' % ('.'.join(selected_study), '/'.join(param_list))
+      params.append(param)
     for feature in experiment.get('enable_features', []):
       enable_features.append(feature + '<' + study_name)
     for feature in experiment.get('disable_features', []):
@@ -102,24 +104,25 @@ def GenerateArgs(config_path, platforms):
 
 def main():
   if len(sys.argv) < 3:
-    print 'Usage: fieldtrial_util.py [config_path] [platform]'
-    print 'Optionally pass \'shell_cmd\' as an extra argument to print'
-    print 'quoted command line arguments.'
+    print('Usage: fieldtrial_util.py [config_path] [platform]')
+    print('Optionally pass \'shell_cmd\' as an extra argument to print')
+    print('quoted command line arguments.')
     exit(-1)
   print_shell_cmd = len(sys.argv) >= 4 and sys.argv[3] == 'shell_cmd'
 
   supported_platforms = ['android', 'android_webview', 'chromeos', 'ios',
                          'linux', 'mac', 'windows']
   if sys.argv[2] not in supported_platforms:
-    print ('\'%s\' is an unknown platform. Supported platforms: %s' %
-        (sys.argv[2], supported_platforms))
+    print('\'%s\' is an unknown platform. Supported platforms: %s' %
+          (sys.argv[2], supported_platforms))
     exit(-1)
 
   generated_args = GenerateArgs(sys.argv[1], [sys.argv[2]])
   if print_shell_cmd:
-    print " ".join(map((lambda arg: '"{0}"'.format(arg)), generated_args))
+    print(" ".join(map((lambda arg: '"{0}"'.format(arg)), generated_args)))
   else:
-    print generated_args
+    print(generated_args)
+
 
 if __name__ == '__main__':
   main()

tools/vim/ninja_output.py

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 import sys
 import os
 import itertools

tools/web_bluetooth/compact_blocklist.py

@@ -14,6 +14,8 @@ Usage:
   compact_blocklist.py <gatt_blocklist.txt>
 """
 
+from __future__ import print_function
+
 import collections
 import string
 import sys

tools/win/link_limiter/build_link_limiter.py

@@ -3,6 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 import glob
 import os
 import shutil
@@ -16,11 +18,11 @@ BUILD_DIR = 'build'
 def run_with_vsvars(cmd, tmpdir=None):
   fd, filename = tempfile.mkstemp('.bat', text=True)
   with os.fdopen(fd, 'w') as f:
-    print >> f, '@echo off'
-    print >> f, r'call "%VS100COMNTOOLS%\vsvars32.bat"'
+    print('@echo off', file=f)
+    print(r'call "%VS100COMNTOOLS%\vsvars32.bat"', file=f)
     if tmpdir:
-      print >> f, r'cd %s' % tmpdir
-    print >> f, cmd
+      print(r'cd %s' % tmpdir, file=f)
+    print(cmd, file=f)
   try:
     p = subprocess.Popen([filename], shell=True, stdout=subprocess.PIPE,
         universal_newlines=True)
@@ -45,17 +47,17 @@ def build(infile):
   outpath = os.path.join(BUILD_DIR, outfile)
   cpptime = os.path.getmtime(infile)
   if not os.path.exists(outpath) or cpptime > os.path.getmtime(outpath):
-    print 'Building %s...' % outfile
+    print('Building %s...' % outfile)
     rc, out = run_with_vsvars(
         'cl /nologo /Ox /Zi /W4 /WX /D_UNICODE /DUNICODE'
         ' /D_CRT_SECURE_NO_WARNINGS /EHsc %s /link /out:%s'
         % (os.path.join('..', infile), outfile), BUILD_DIR)
     if rc:
-      print out
-      print 'Failed to build %s' % outfile
+      print(out)
+      print('Failed to build %s' % outfile)
       sys.exit(1)
   else:
-    print '%s already built' % outfile
+    print('%s already built' % outfile)
   return outpath
 
 
@@ -74,7 +76,7 @@ def main():
   if not vcdir:
     vcdir = get_vc_dir()
     if not vcdir:
-      print 'Could not get VCINSTALLDIR. Run vsvars32.bat?'
+      print('Could not get VCINSTALLDIR. Run vsvars32.bat?')
       return 1
     os.environ['PATH'] += (';' + os.path.join(vcdir, 'bin') +
                            ';' + os.path.join(vcdir, r'..\Common7\IDE'))
@@ -82,15 +84,15 @@ def main():
   # Verify that we can find link.exe.
   link = os.path.join(vcdir, 'bin', 'link.exe')
   if not os.path.exists(link):
-    print 'link.exe not found at %s' % link
+    print('link.exe not found at %s' % link)
     return 1
 
   exe_name = build('limiter.cc')
   for shim_exe in ('lib.exe', 'link.exe'):
     newpath = '%s__LIMITER.exe' % shim_exe
     shutil.copyfile(exe_name, newpath)
-    print '%s shim built. Use with msbuild like: "/p:LinkToolExe=%s"' \
-        % (shim_exe, os.path.abspath(newpath))
+    print('%s shim built. Use with msbuild like: "/p:LinkToolExe=%s"' \
+        % (shim_exe, os.path.abspath(newpath)))
 
   return 0
 

tools/win/linker_verbose_tracking.py

@@ -66,6 +66,8 @@ common.lib(content_message_generator.obj).obj pulled in for symbol ...
         Command-line obj file: url_loader.mojom.obj
 """
 
+from __future__ import print_function
+
 import io
 import pdb
 import re
@@ -165,9 +167,9 @@ def TrackObj(cross_refs, cross_refed_symbols, obj_name):
     targets.append(obj_name)
   # Print what we are searching for.
   if len(targets) == 1:
-    print 'Searching for %s' % targets[0]
+    print('Searching for %s' % targets[0])
   else:
-    print 'Searching for %s' % targets
+    print('Searching for %s' % targets)
   printed = False
   # Follow the chain of references up to an arbitrary maximum level, which has
   # so far never been approached.
@@ -179,28 +181,28 @@ def TrackObj(cross_refs, cross_refed_symbols, obj_name):
         if target in cross_refs.keys():
           symbol = cross_refed_symbols[target]
           printed = True
-          print '%s.obj pulled in for symbol "%s" by' % (target, symbol)
+          print('%s.obj pulled in for symbol "%s" by' % (target, symbol))
           for ref in cross_refs[target]:
-            print '\t%s' % ref
+            print('\t%s' % ref)
             new_targets[ref] = True
     if len(new_targets) == 0:
       break
-    print
+    print()
     targets = new_targets.keys()
   if not printed:
-    print ('No references to %s found. Directly specified in sources or a '
+    print('No references to %s found. Directly specified in sources or a '
           'source_set?' % obj_name)
 
 
 def main():
   if len(sys.argv) < 3:
-    print r'Usage: %s <verbose_output_file> <objfile>' % sys.argv[0]
-    print r'Sample: %s chrome_dll_verbose.txt SkTLS' % sys.argv[0]
+    print(r'Usage: %s <verbose_output_file> <objfile>' % sys.argv[0])
+    print(r'Sample: %s chrome_dll_verbose.txt SkTLS' % sys.argv[0])
     return 0
   cross_refs, cross_refed_symbols = ParseVerbose(sys.argv[1])
-  print 'Database loaded - %d xrefs found' % len(cross_refs)
+  print('Database loaded - %d xrefs found' % len(cross_refs))
   if not len(cross_refs):
-    print 'No data found to analyze. Exiting'
+    print('No data found to analyze. Exiting')
     return 0
   TrackObj(cross_refs, cross_refed_symbols, sys.argv[2])
 

tools/win/pdb_compare_globals.py

@@ -18,6 +18,8 @@ Typical output from ShowGlobals.exe is lines like these:
   1       1824    0       0       LcidToLocaleNameTable   chrome.dll.pdb
 """
 
+from __future__ import print_function
+
 import os
 import subprocess
 import sys
@@ -32,7 +34,7 @@ def LoadSymbols(pdb_name):
   elif extension in ['.txt']:
     lines = open(pdb_name).readlines()
   else:
-    print 'Unrecognized extension in %s' % pdb_name
+    print('Unrecognized extension in %s' % pdb_name)
     return result
   for line in lines:
     parts = line.split('\t')
@@ -45,17 +47,17 @@ def LoadSymbols(pdb_name):
 
 
 def ShowExtras(symbols_A, symbols_B, name_A, name_B):
-  print 'Symbols that are in %s but not in %s' % (name_A, name_B)
+  print('Symbols that are in %s but not in %s' % (name_A, name_B))
   for key in symbols_A:
     if not key in symbols_B:
       # Print all the numerical data, followed by the symbol name, separated by
       # tabs.
-      print '\t'.join(symbols_A[key] + [key])
-  print
+      print('\t'.join(symbols_A[key] + [key]))
+  print()
 
 
 def ShowDifferences(symbols_A, symbols_B, name_A, name_B):
-  print 'Symbols that are changed from %s to %s' % (name_A, name_B)
+  print('Symbols that are changed from %s to %s' % (name_A, name_B))
   for key in symbols_A:
     if key in symbols_B:
       value_a = symbols_A[key]
@@ -63,10 +65,10 @@ def ShowDifferences(symbols_A, symbols_B, name_A, name_B):
       if value_a != value_b:
         # Print the symbol name and then the two versions of the numerical data,
         # indented.
-        print '%s changed from/to:' % key
-        print '\t' + '\t'.join(value_a)
-        print '\t' + '\t'.join(value_b)
-  print
+        print('%s changed from/to:' % key)
+        print('\t' + '\t'.join(value_a))
+        print('\t' + '\t'.join(value_b))
+  print()
 
 
 def main():
@@ -74,14 +76,14 @@ def main():
   symbols_2 = LoadSymbols(sys.argv[2])
 
   if len(symbols_1) == 0:
-    print 'No data found in %s - fastlink?' % sys.argv[1]
+    print('No data found in %s - fastlink?' % sys.argv[1])
     return
   if len(symbols_2) == 0:
-    print 'No data found in %s - fastlink?' % sys.argv[2]
+    print('No data found in %s - fastlink?' % sys.argv[2])
     return
 
-  print ('%d interesting globals in %s, %d interesting globals in %s' %
-         (len(symbols_1), sys.argv[1], len(symbols_2), sys.argv[2]))
+  print('%d interesting globals in %s, %d interesting globals in %s' %
+        (len(symbols_1), sys.argv[1], len(symbols_2), sys.argv[2]))
 
   ShowExtras(symbols_1, symbols_2, sys.argv[1], sys.argv[2])
   ShowExtras(symbols_2, symbols_1, sys.argv[2], sys.argv[1])

tools/win/pe_summarize.py

@@ -52,6 +52,8 @@ process is loaded. Other sections, such as .data, produce private pages and are
 therefore objectively 'worse' than the others.
 """
 
+from __future__ import print_function
+
 import os
 import subprocess
 import sys
@@ -66,9 +68,9 @@ def _FindSection(section_list, section_name):
 
 def main():
   if len(sys.argv) < 2:
-    print r'Usage: %s PEFileName [OtherPeFileNames...]' % sys.argv[0]
-    print r'Sample: %s chrome.dll' % sys.argv[0]
-    print r'Sample: %s chrome.dll original\chrome.dll' % sys.argv[0]
+    print(r'Usage: %s PEFileName [OtherPeFileNames...]' % sys.argv[0])
+    print(r'Sample: %s chrome.dll' % sys.argv[0])
+    print(r'Sample: %s chrome.dll original\chrome.dll' % sys.argv[0])
     return 0
 
   # Track the name of the last PE (Portable Executable) file to be processed -
@@ -78,11 +80,11 @@ def main():
   for pe_path in sys.argv[1:]:
     results = []
     if not os.path.exists(pe_path):
-      print '%s does not exist!' % pe_path
+      print('%s does not exist!' % pe_path)
       continue
 
-    print 'Size of %s is %1.6f MB' % (pe_path, os.path.getsize(pe_path) / 1e6)
-    print '%10s:  %9s  ,  %9s' % ('name', 'mem size', 'disk size')
+    print('Size of %s is %1.6f MB' % (pe_path, os.path.getsize(pe_path) / 1e6))
+    print('%10s:  %9s  ,  %9s' % ('name', 'mem size', 'disk size'))
 
     sections = None
     # Pass the undocumented /nopdb header to avoid hitting symbol servers for
@@ -108,10 +110,10 @@ def main():
             # understand - 33.199959 is easier to read than 33199959. Decimal MB
             # is used to allow simple conversions to a precise number of bytes.
             if abs(memory_size - disk_size) < 512:
-              print '%10s: %9.6f MB' % (name, memory_size / 1e6)
+              print('%10s: %9.6f MB' % (name, memory_size / 1e6))
             else:
-              print '%10s: %9.6f MB, %9.6f MB' % (name, memory_size / 1e6,
-                                                  disk_size / 1e6)
+              print('%10s: %9.6f MB, %9.6f MB' % (name, memory_size / 1e6,
+                                                  disk_size / 1e6))
             results.append((name, memory_size))
             sections = None
     except WindowsError as error:
@@ -120,14 +122,14 @@ def main():
                r'Visual Studio\2017\Professional\VC\Auxiliary\Build'
                r'\vcvarsall.bat amd64" or similar to add dumpbin to the path.')
       else:
-        print error
+        print(error)
       break
 
-    print
+    print()
     pe_filepart = os.path.split(pe_path)[1]
     if pe_filepart.lower() == last_pe_filepart.lower():
       # Print out the section-by-section size changes, for memory sizes only.
-      print 'Memory size change from %s to %s' % (last_pe_path, pe_path)
+      print('Memory size change from %s to %s' % (last_pe_path, pe_path))
       total_delta = 0
       for i in range(len(results)):
         section_name = results[i][0]
@@ -140,7 +142,7 @@ def main():
           delta -= last_results[last_i][1]
         total_delta += delta
         if delta:
-          print '%12s: %7d bytes change' % (section_name, delta)
+          print('%12s: %7d bytes change' % (section_name, delta))
       for last_i in range(len(last_results)):
         section_name = last_results[last_i][0]
         # Find sections that exist only in last_results.
@@ -148,8 +150,8 @@ def main():
         if i < 0:
           delta = -last_results[last_i][1]
           total_delta += delta
-          print '%12s: %7d bytes change' % (section_name, delta)
-      print 'Total change: %7d bytes' % total_delta
+          print('%12s: %7d bytes change' % (section_name, delta))
+      print('Total change: %7d bytes' % total_delta)
     last_pe_filepart = pe_filepart
     last_pe_path = pe_path
     last_results = results

tools/win/setenv.py

@@ -6,6 +6,8 @@
 Helper script to do the heavy lifting for setenv.bat.
 """
 
+from __future__ import print_function
+
 import os
 import sys
 
@@ -17,13 +19,13 @@ import vs_toolchain
 
 if bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))):
   win_sdk_dir = vs_toolchain.SetEnvironmentAndGetSDKDir()
-  print os.path.normpath(os.path.join(win_sdk_dir, 'bin/SetEnv.cmd'))
+  print(os.path.normpath(os.path.join(win_sdk_dir, 'bin/SetEnv.cmd')))
 else:
   vs_version = vs_toolchain.GetVisualStudioVersion()
   vs_path = vs_toolchain.DetectVisualStudioPath()
   if vs_version == '2017':
-    print os.path.join(vs_path, r'VC\Auxiliary\Build\vcvarsall.bat')
+    print(os.path.join(vs_path, r'VC\Auxiliary\Build\vcvarsall.bat'))
   elif vs_version == '2015':
-    print os.path.join(vs_path, r'VC\vcvarsall.bat')
+    print(os.path.join(vs_path, r'VC\vcvarsall.bat'))
   else:
     raise Exception('Unknown VS version %s' % vs_version)

tools/win/sizeviewer/sizeviewer.py

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 import base64
 import codecs
 import json
@@ -84,7 +86,7 @@ def main():
             for dll in ('chrome.dll', 'chrome_child.dll')]
   for dll_path in dlls:
     if os.path.exists(dll_path):
-      print 'Tallying %s...' % dll_path
+      print('Tallying %s...' % dll_path)
       json_path = dll_path + '.json'
       Run(os.path.join(BASE_DIR, '..', '..', '..', 'third_party', 'syzygy',
                        'binaries', 'exe', 'experimental', 'code_tally.exe'),
@@ -93,9 +95,10 @@ def main():
           '--output-file=' + json_path)
       jsons.append(json_path)
   if not jsons:
-    print 'Couldn\'t find dlls.'
-    print 'Pass fully qualified dll name(s) if you want to use something other '
-    print 'than out\\Release\\chrome.dll and chrome_child.dll.'
+    print('Couldn\'t find dlls.')
+    print(
+        'Pass fully qualified dll name(s) if you want to use something other ')
+    print('than out\\Release\\chrome.dll and chrome_child.dll.')
     return 1
 
   # Munge the code_tally json format into an easier-to-view format.
@@ -103,7 +106,7 @@ def main():
     with open(json_name, 'r') as jsonf:
       all_data = json.load(jsonf)
     html_path = os.path.splitext(json_name)[0] + '.html'
-    print 'Generating %s... (standlone)' % html_path
+    print('Generating %s... (standlone)' % html_path)
     by_source = {}
     symbols_index = {}
     symbols = []

tools/win/subtract_time.py

@@ -7,6 +7,8 @@ This script converts two %time% compatible strings passed to it into seconds,
 subtracts them, and prints the difference. That's it. It's used by timeit.bat.
 """
 
+from __future__ import print_function
+
 import re
 import sys
 
@@ -17,5 +19,6 @@ def ParseTime(time_string):
   hours, minutes, seconds, fraction = map(int, match.groups())
   return hours * 3600 + minutes * 60 + seconds + fraction * .01
 
-print "%1.2f seconds elapsed time" % (ParseTime(sys.argv[1]) -
-                                      ParseTime(sys.argv[2]))
+
+print("%1.2f seconds elapsed time" %
+      (ParseTime(sys.argv[1]) - ParseTime(sys.argv[2])))

tools/yes_no.py

@@ -2,12 +2,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 import sys
 
 
 def YesNo(prompt):
   """Prompts with a yes/no question, returns True if yes."""
-  print prompt,
+  print(prompt, end=' ')
   sys.stdout.flush()
   # http://code.activestate.com/recipes/134892/
   if sys.platform == 'win32':
@@ -24,5 +26,5 @@ def YesNo(prompt):
       ch = sys.stdin.read(1)
     finally:
       termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
-  print ch
+  print(ch)
   return ch in ('Y', 'y')