Changeset 271151 in webkit

Timestamp:

Jan 5, 2021, 9:59:56 AM (4 years ago)

Author:

ap@apple.com

Message:

Update root level scripts in Tools/Scripts to Python 3
​https://bugs.webkit.org/show_bug.cgi?id=220200

Reviewed by Darin Adler and Jonathan Bedard.

Mostly 2to3 inspired.

• Scripts/check-for-global-bss-symbols-in-webkitgtk-libs:
• Scripts/check-for-invalid-symbols-in-version-script:
• Scripts/check-for-platform-layering-violations:
• Scripts/clean-webkit:
• Scripts/compare-results:
• Scripts/compare-webkit-configurations:
• Scripts/download-github-release.py:
• Scripts/dump-webkit-tests-run:
• Scripts/export-w3c-performance-wg-tests:
• Scripts/extract-dependencies-from-makefile:
• Scripts/extract-localizable-strings:
• Scripts/find-duplicate-files:
• Scripts/ic-stats.py:
• Scripts/import-w3c-performance-wg-tests:
• Scripts/make-dist:
• Scripts/malloc-tree:
• Scripts/mark-jsc-stress-test:
• Scripts/open-layout-test:
• Scripts/read-checksum-from-png:
• Scripts/rebase-patch-after-webkit-move:
• Scripts/run-gtk-tests:
• Scripts/run-webdriver-tests:
• Scripts/run-wpe-tests:
• Scripts/sampstat:
• Scripts/sync-feature-defines:
• Scripts/sync-master-with-upstream:
• Scripts/update-wasm-gcc-torture.py:
• Scripts/validate-committer-lists:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/check-for-global-bss-symbols-in-webkitgtk-libs (modified) (2 diffs)
• Scripts/check-for-invalid-symbols-in-version-script (modified) (2 diffs)
• Scripts/check-for-platform-layering-violations (modified) (2 diffs)
• Scripts/clean-webkit (modified) (1 diff)
• Scripts/compare-results (modified) (8 diffs)
• Scripts/compare-webkit-configurations (modified) (2 diffs)
• Scripts/download-github-release.py (modified) (2 diffs)
• Scripts/dump-webkit-tests-run (modified) (5 diffs)
• Scripts/export-w3c-performance-wg-tests (modified) (2 diffs)
• Scripts/extract-dependencies-from-makefile (modified) (1 diff)
• Scripts/extract-localizable-strings (modified) (1 diff)
• Scripts/find-duplicate-files (modified) (1 diff)
• Scripts/ic-stats.py (modified) (3 diffs)
• Scripts/import-w3c-performance-wg-tests (modified) (2 diffs)
• Scripts/make-dist (modified) (3 diffs)
• Scripts/malloc-tree (modified) (1 diff)
• Scripts/mark-jsc-stress-test (modified) (1 diff)
• Scripts/open-layout-test (modified) (1 diff)
• Scripts/read-checksum-from-png (modified) (2 diffs)
• Scripts/rebase-patch-after-webkit-move (modified) (5 diffs)
• Scripts/run-gtk-tests (modified) (1 diff)
• Scripts/run-webdriver-tests (modified) (2 diffs)
• Scripts/run-wpe-tests (modified) (1 diff)
• Scripts/sampstat (modified) (2 diffs)
• Scripts/sync-feature-defines (modified) (2 diffs)
• Scripts/sync-master-with-upstream (modified) (1 diff)
• Scripts/update-wasm-gcc-torture.py (modified) (3 diffs)
• Scripts/validate-committer-lists (modified) (14 diffs)

trunk/Tools/ChangeLog ¶

@@ +1 @@
+2021-01-05  Alexey Proskuryakov  <ap@apple.com>
+
+        Update root level scripts in Tools/Scripts to Python 3
+        https://bugs.webkit.org/show_bug.cgi?id=220200
+
+        Reviewed by Darin Adler and Jonathan Bedard.
+
+        Mostly 2to3 inspired.
+
+        * Scripts/check-for-global-bss-symbols-in-webkitgtk-libs:
+        * Scripts/check-for-invalid-symbols-in-version-script:
+        * Scripts/check-for-platform-layering-violations:
+        * Scripts/clean-webkit:
+        * Scripts/compare-results:
+        * Scripts/compare-webkit-configurations:
+        * Scripts/download-github-release.py:
+        * Scripts/dump-webkit-tests-run:
+        * Scripts/export-w3c-performance-wg-tests:
+        * Scripts/extract-dependencies-from-makefile:
+        * Scripts/extract-localizable-strings:
+        * Scripts/find-duplicate-files:
+        * Scripts/ic-stats.py:
+        * Scripts/import-w3c-performance-wg-tests:
+        * Scripts/make-dist:
+        * Scripts/malloc-tree:
+        * Scripts/mark-jsc-stress-test:
+        * Scripts/open-layout-test:
+        * Scripts/read-checksum-from-png:
+        * Scripts/rebase-patch-after-webkit-move:
+        * Scripts/run-gtk-tests:
+        * Scripts/run-webdriver-tests:
+        * Scripts/run-wpe-tests:
+        * Scripts/sampstat:
+        * Scripts/sync-feature-defines:
+        * Scripts/sync-master-with-upstream:
+        * Scripts/update-wasm-gcc-torture.py:
+        * Scripts/validate-committer-lists:
+
 2021-01-05  Youenn Fablet  <youenn@apple.com>
 

trunk/Tools/Scripts/check-for-global-bss-symbols-in-webkitgtk-libs ¶

@@ -20 +20 @@
 
 if len(sys.argv) < 3:
-    print "Usage: %s lib1 lib2" % sys.argv[0]
+    print("Usage: %s lib1 lib2" % sys.argv[0])
     sys.exit(1)
 
@@ -32 +32 @@
 
 if symbols:
-    print 'The following symbols are global in %s and not in %s' % (sys.argv[1], sys.argv[2])
-    print '\n'.join(sorted(symbols))
+    print('The following symbols are global in %s and not in %s' % (sys.argv[1], sys.argv[2]))
+    print('\n'.join(sorted(symbols)))
     sys.exit(1)
 

trunk/Tools/Scripts/check-for-invalid-symbols-in-version-script ¶

@@ -21 +21 @@
 
 if len(sys.argv) < 3:
-    print "Usage: %s script lib" % sys.argv[0]
+    print("Usage: %s script lib" % sys.argv[0])
     sys.exit(1)
 
@@ -35 +35 @@
 
 if symbols:
-    print 'The following symbols are in version script %s and not in library %s' % (sys.argv[1], sys.argv[2])
-    print '\n'.join(sorted(symbols))
+    print('The following symbols are in version script %s and not in library %s' % (sys.argv[1], sys.argv[2]))
+    print('\n'.join(sorted(symbols)))
     sys.exit(1)
 

trunk/Tools/Scripts/check-for-platform-layering-violations ¶

@@ -54 +54 @@
 
         if header not in platform_headers and header not in PLATFORM_GENERATED_HEADERS:
-            print "ERROR: %s:%d %s" % (source_file[len(checkout_root) + 1:], line_count, line.strip('\n'))
+            print("ERROR: %s:%d %s" % (source_file[len(checkout_root) + 1:], line_count, line.strip('\n')))
             failures_found += 1
 
@@ -74 +74 @@
 
 if layering_violations_count:
-    print "Total: %d layering violations found in %s" % (layering_violations_count, platform_dir[len(checkout_root) + 1:])
+    print("Total: %d layering violations found in %s" % (layering_violations_count, platform_dir[len(checkout_root) + 1:]))
     sys.exit(1)
 

trunk/Tools/Scripts/clean-webkit ¶

@@ -67 +67 @@
             files = listWebKitBuildFiles(fs)
             keepDirs = usesFlatpak() and ["Toolchains", "UserFlatpak"] or ["DependenciesGTK", "DependenciesWPE"]
-            files = filter(lambda path: path[len("WebKitBuild/"):] not in keepDirs, files)
+            files = [path for path in files if path[len("WebKitBuild/"):] not in keepDirs]
             removeFiles(fs, files)
     else:

trunk/Tools/Scripts/compare-results ¶

@@ -37 +37 @@
     from scipy import stats
 except:
-    print "ERROR: scipy package is not installed. Run `pip install scipy`"
+    print("ERROR: scipy package is not installed. Run `pip install scipy`")
     sys.exit(1)
 
@@ -43 +43 @@
     import numpy
 except:
-    print "ERROR: numpy package is not installed. Run `pip install numpy`"
+    print("ERROR: numpy package is not installed. Run `pip install numpy`")
     sys.exit(1)
 
@@ -229 +229 @@
     strings.append(verticalSeparator)
 
-    print "\n"
+    print("\n")
     for s in strings:
         print(s)
-    print "\n"
+    print("\n")
 
 def writeCSV(a, b, fileName):
@@ -328 +328 @@
     else:
         payload = payload["MotionMark-1.1.1"]
-    testNames = payload["tests"].keys()
+    testNames = list(payload["tests"].keys())
     numTests = len(payload["tests"][testNames[0]]["metrics"]["Score"]["current"])
     results = []
@@ -366 +366 @@
         return False
 
-    print "Should not be reached."
+    print("Should not be reached.")
     assert False
 
@@ -374 +374 @@
     aMean = numpy.mean(a)
     bMean = numpy.mean(b)
-    print "a mean = {:.5f}".format(aMean)
-    print "b mean = {:.5f}".format(bMean)
-
-    print "pValue = {:.10f}".format(pValue)
+    print("a mean = {:.5f}".format(aMean))
+    print("b mean = {:.5f}".format(bMean))
+
+    print("pValue = {:.10f}".format(pValue))
 
     if biggerIsBetter(benchmarkType):
-        print "(Bigger means are better.)"
+        print("(Bigger means are better.)")
         if aMean > bMean:
-            print "{:.3f} times worse".format((aMean / bMean))
+            print("{:.3f} times worse".format((aMean / bMean)))
         else:
-            print "{:.3f} times better".format((bMean / aMean))
+            print("{:.3f} times better".format((bMean / aMean)))
     else:
-        print "(Smaller means are better.)"
+        print("(Smaller means are better.)")
         if aMean > bMean:
-            print "{:.3f} times better".format((aMean / bMean))
+            print("{:.3f} times better".format((aMean / bMean)))
         else:
-            print "{:.3f} times worse".format((bMean / aMean))
+            print("{:.3f} times worse".format((bMean / aMean)))
 
     if pValue <= 0.05:
-        print "Results ARE significant"
+        print("Results ARE significant")
     else:
-        print "Results ARE NOT significant"
+        print("Results ARE NOT significant")
 
 def getOptions():
@@ -439 +439 @@
 
     if typeA != typeB:
-        print "-a and -b are not the same benchmark. a={} b={}".format(typeA, typeB)
+        print("-a and -b are not the same benchmark. a={} b={}".format(typeA, typeB))
         sys.exit(1)
 
     if not (typeA and typeB):
-        print "Unknown benchmark type. a={} b={}".format(typeA, typeB)
+        print("Unknown benchmark type. a={} b={}".format(typeA, typeB))
         sys.exit(1)
     
@@ -480 +480 @@
             writeCSV(plt5Breakdown(a), plt5Breakdown(b), args.csv)
     else:
-        print "Unknown benchmark type"
+        print("Unknown benchmark type")
         sys.exit(1)
 

trunk/Tools/Scripts/compare-webkit-configurations ¶

@@ -40 +40 @@
     force_webkit2 = args.webkit2
     if args.comparison == "remote-layer-tree":
-        print "Forcing use of WebKit2, as the remote layer tree depends on WebKit2."
+        print("Forcing use of WebKit2, as the remote layer tree depends on WebKit2.")
         force_webkit2 = True
 
     if args.comparison == "webkit2" and force_webkit2:
-        print "It doesn't make sense to test WebKit1 vs. WebKit2 *and* force WebKit2 on."
+        print("It doesn't make sense to test WebKit1 vs. WebKit2 *and* force WebKit2 on.")
         sys.exit(1)
 
@@ -66 +66 @@
         return "-2"
 
-    print "Unknown comparison:", comparison_name
+    print("Unknown comparison:", comparison_name)
     sys.exit(1)
 

trunk/Tools/Scripts/download-github-release.py ¶

@@ -119 +119 @@
     version_info_path = binary_path + '.version'
 
-    print(('Updating {}...'.format(args.filename)))
+    print('Updating {}...'.format(args.filename))
 
     existing_version_info = load_version_info(version_info_path)
     if existing_version_info:
-        print(('Found existing release: {}'.format(existing_version_info['tag_name'])))
+        print('Found existing release: {}'.format(existing_version_info['tag_name']))
     else:
         print('No existing release found.')
 
     release_title = 'release "{}"'.format(args.release_tag) if args.release_tag else 'latest release'
-    print(('Seeking {} from {}...'.format(release_title, args.repo)))
+    print('Seeking {} from {}...'.format(release_title, args.repo))
     release_url, target_version_info = find_release(args.endpoint, args.repo, args.filename, args.token, args.release_tag)
 
@@ -148 +148 @@
         os.makedirs(args.output_dir)
 
-    print(('Downloading to {}...'.format(os.path.abspath(args.output_dir))))
+    print('Downloading to {}...'.format(os.path.abspath(args.output_dir)))
     download_release(release_url, binary_path, args.token)
     save_version_info(version_info_path, target_version_info)

trunk/Tools/Scripts/dump-webkit-tests-run ¶

@@ -1 +1 @@
 #!/usr/bin/env python
+
+# A webkitpy import needs to go first for autoinstaller to work with subsequent imports.
+import webkitpy
+
 import json
 import optparse
 import os
+import six
 import sys
 
@@ -16 +21 @@
                 trie = json.load(fp)
         else:
-            print >> sys.stderr, "file not found: %s" % args[0]
+            six.print_("file not found: %s" % args[0], file=sys.stderr)
             sys.exit(1)
     else:
@@ -23 +28 @@
     results = convert_trie_to_flat_paths(trie)
     tests_run = []
-    for (test, result) in results.iteritems():
+    for (test, result) in six.iteritems(results):
         # Each result is a dict containing
         # { 'results': [worker #, test # in worker, driver pid,
@@ -30 +35 @@
             tests_run.append((test, result['results'][1]))
 
-    print "\n".join(t[0] for t in sorted(tests_run, key=lambda t: t[1]))
+    print("\n".join(t[0] for t in sorted(tests_run, key=lambda t: t[1])))
 
 
@@ -37 +42 @@
     # so that this code can stand alone.
     result = {}
-    for name, data in trie.iteritems():
+    for name, data in six.iteritems(trie):
         if prefix:
             name = prefix + "/" + name

trunk/Tools/Scripts/export-w3c-performance-wg-tests ¶

@@ -44 +44 @@
 
 if len(sys.argv) != 3:
-    print 'USAGE: %s path_to_webkit_checkout_root path_to_webperf_checkout_root' % sys.argv[0]
+    print('USAGE: %s path_to_webkit_checkout_root path_to_webperf_checkout_root' % sys.argv[0])
     sys.exit(1)
 
@@ -78 +78 @@
                             line = line.replace(to_find, replace_with)
                         out_file.write(line)
-                print 'Exported %s' % os.path.join(root, filename)
+                print('Exported %s' % os.path.join(root, filename))

trunk/Tools/Scripts/extract-dependencies-from-makefile ¶

@@ -34 +34 @@
 # to the specified files.
 
-
-from __future__ import print_function
 
 import argparse

trunk/Tools/Scripts/extract-localizable-strings ¶

@@ -1 +1 @@
 #!/bin/sh
 
-exec "$(dirname $0)/../../Source/WebCore/Scripts/extract-localizable-strings.pl" "$@"
+exec("$(dirname $0)/../../Source/WebCore/Scripts/extract-localizable-strings.pl" "$@")

trunk/Tools/Scripts/find-duplicate-files ¶

@@ -54 +54 @@
 
 for fileList in sorted(duplicates):
-    print fileList
+    print(fileList)

trunk/Tools/Scripts/ic-stats.py ¶

@@ -75 +75 @@
 
     def dumpStats(self):
-        print "Total Slow getById = {0:>13,d}".format(self.totalSlowGetById)
-        print "Total Slow putById = {0:>13,d}".format(self.totalSlowPutById)
+        print("Total Slow getById = {0:>13,d}".format(self.totalSlowGetById))
+        print("Total Slow putById = {0:>13,d}".format(self.totalSlowPutById))
 
-        print "Operation                            Base                  Property                              Location          Count  % tot"
-        print "-----------------------------------  --------------------  ------------------------------------  ------------  ---------   slow"
+        print("Operation                            Base                  Property                              Location          Count  % tot")
+        print("-----------------------------------  --------------------  ------------------------------------  ------------  ---------   slow")
 
         keys = sorted(self.combinedRecords.keys(), key=lambda t: self.combinedRecords[t], reverse=True)
@@ -98 +98 @@
                 property = property[0:32] + "..."
 
-            print "{0:35}  {1:20}  {2:36}  {3:12}  {4:>9d}{5}".format(operation[0:34], base, property, key[3], count, slowPercent)
+            print("{0:35}  {1:20}  {2:36}  {3:12}  {4:>9d}{5}".format(operation[0:34], base, property, key[3], count, slowPercent))
 
 
 def usage():
-    print "Usage: {0} [ic-stats-file]".format(sys.argv[0])
-    print "        Where <ic-stats-file> is the results of using the useICStats option."
+    print("Usage: {0} [ic-stats-file]".format(sys.argv[0]))
+    print("        Where <ic-stats-file> is the results of using the useICStats option.")
     exit(1)
 
@@ -113 +113 @@
             file = open(sys.argv[1], "r")
         except IOError as e:
-            print "Couldn't open {0}, {1}".format(sys.argv[1], e.strerror)
+            print("Couldn't open {0}, {1}".format(sys.argv[1], e.strerror))
             usage()
         except:
-            print "Unexpected error:", sys.exc_info()[0]
+            print("Unexpected error:", sys.exc_info()[0])
             usage()
     else:

trunk/Tools/Scripts/import-w3c-performance-wg-tests ¶

@@ -43 +43 @@
 
 if len(sys.argv) != 3:
-    print 'USAGE: %s path_to_webperf_checkout_root path_to_webkit_checkout_root' % sys.argv[0]
+    print('USAGE: %s path_to_webperf_checkout_root path_to_webkit_checkout_root' % sys.argv[0])
     sys.exit(1)
 
@@ -50 +50 @@
 
 if os.path.exists(destination_directory):
-    print 'Refusing to overwrite existing directory: %s' % destination_directory
+    print('Refusing to overwrite existing directory: %s' % destination_directory)
     sys.exit(1)
 os.makedirs(destination_directory)

trunk/Tools/Scripts/make-dist ¶

@@ -16 +16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-from __future__ import print_function
 from contextlib import closing
 
@@ -121 +120 @@
                 return Ruleset.global_rules().passes(entry) and self.rules.passes(entry)
 
-            to_keep = filter(passes_all_rules, dirs)
+            to_keep = list(filter(passes_all_rules, dirs))
             del dirs[:]
             dirs.extend(to_keep)
@@ -238 +237 @@
             try:
                 os.mkdir(directory)
-            except OSError, e:
+            except OSError as e:
                 if e.errno != errno.EEXIST or not os.path.isdir(directory):
                     raise Exception("Could not create %s dir at %s: %s" % (directory_type, directory, str(e)))

trunk/Tools/Scripts/malloc-tree ¶

@@ -199 +199 @@
     sortedRootNodes = sorted(rootNodes.values(), key=sortKeyByBytes, reverse=True)
 
-    print 'Call graph:'
+    print('Call graph:')
     try:
         for node in sortedRootNodes:
             node.printNode()
-            print 
+            print() 
     except:
         pass

trunk/Tools/Scripts/mark-jsc-stress-test ¶

@@ -75 +75 @@
         skip_conditions = []
         skip_line = "{} {} {}"
-        supported_variables = filter(lambda variable: variable in self._conditions, JSCTestModifier.variables)
+        supported_variables = [variable for variable in JSCTestModifier.variables if variable in self._conditions]
         condition_template = "{}" if len(supported_variables) == 1 else "({})"
         for variable in supported_variables:

trunk/Tools/Scripts/open-layout-test ¶

@@ -66 +66 @@
     test_url = driver.test_to_uri(test_name)
     if not needs_server:
-        print "Opening %s" % test_url
+        print("Opening %s" % test_url)
         subprocess.Popen(['open', test_url])
         return

trunk/Tools/Scripts/read-checksum-from-png ¶

@@ -28 +28 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import with_statement
 import sys
 
@@ -37 +36 @@
     for filename in sys.argv[1:]:
         with open(filename, 'r') as filehandle:
-            print "%s: %s" % (read_checksum_from_png.read_checksum(filehandle), filename)
+            print("%s: %s" % (read_checksum_from_png.read_checksum(filehandle), filename))

trunk/Tools/Scripts/rebase-patch-after-webkit-move ¶

@@ -22 +22 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# A webkitpy import needs to go first for autoinstaller to work with subsequent imports.
+import webkitpy
+
 import os
+import six
 import sys
 
@@ -49 +53 @@
         return RebaseStatus.DO_NOT_NEED
 
-    for current_name, rebased_name in REBASE_DICTIONARY.iteritems():
+    for current_name, rebased_name in six.iteritems(REBASE_DICTIONARY):
         # Check if we've already rebased. We need to check if the rebased_name is already in the REBASE_DICTIONARY,
         # in this case, we don't know if we've already been rebased.
@@ -61 +65 @@
 
     # Check if we might need a rebase
-    for current_name, rebased_name in REBASE_DICTIONARY.iteritems():
+    for current_name, rebased_name in six.iteritems(REBASE_DICTIONARY):
         if append_source(current_name) in line:
             return RebaseStatus.MAYBE_NEED
@@ -70 +74 @@
 def rebase_line(line):
     if not is_editable_line(line):
-        for current_name, rebased_name in REBASE_DICTIONARY.iteritems():
+        for current_name, rebased_name in six.iteritems(REBASE_DICTIONARY):
             if current_name in line:
                 sys.stderr.write('Found an instance of {} in the patch.  Did you mean to replace it with {}?\n'.format(current_name, rebased_name))
         return line
-    for current_name, rebased_name in REBASE_DICTIONARY.iteritems():
+    for current_name, rebased_name in six.iteritems(REBASE_DICTIONARY):
         if append_source(current_name) in line:
             return line.replace(append_source(current_name), append_source(rebased_name))
@@ -119 +123 @@
         return []
     elif sys.argv[1] == '-h' or sys.argv[1] == 'help':
-        print 'rebase-patch-after-webkit-move usage:'
-        print '\trebase-patch-after-webkit-move -h, help'
-        print '\t\tPrint this message'
-        print '\trebase-patch-after-webkit-move <path to patch>'
-        print '\t\tReplace the patch at the provided path with a rebased patch'
-        print '\trebase-patch-after-webkit-move'
-        print '\t\tTreat stdin as the patch to be rebased'
+        print('rebase-patch-after-webkit-move usage:')
+        print('\trebase-patch-after-webkit-move -h, help')
+        print('\t\tPrint this message')
+        print('\trebase-patch-after-webkit-move <path to patch>')
+        print('\t\tReplace the patch at the provided path with a rebased patch')
+        print('\trebase-patch-after-webkit-move')
+        print('\t\tTreat stdin as the patch to be rebased')
         exit(0)
 

trunk/Tools/Scripts/run-gtk-tests ¶

@@ -18 +18 @@
 # Boston, MA 02110-1301, USA.
 
-from __future__ import print_function
 import logging
 import subprocess

trunk/Tools/Scripts/run-webdriver-tests ¶

@@ -61 +61 @@
 try:
     port = Host().port_factory.get(options.platform, options)
-except NotImplementedError, e:
+except NotImplementedError as e:
     _log.error(str(e))
     sys.exit(-1)
@@ -77 +77 @@
 
         if not jhbuildutils.enter_jhbuild_environment_if_available(port.name()):
-            print '***'
-            print '*** Warning: jhbuild environment not present and not running in flatpak.'
-            print '*** Run update-webkitgtk-libs or update-webkit-flatpak before build-webkit to ensure proper testing..'
-            print '***'
+            print('***')
+            print('*** Warning: jhbuild environment not present and not running in flatpak.')
+            print('*** Run update-webkitgtk-libs or update-webkit-flatpak before build-webkit to ensure proper testing..')
+            print('***')
 
 runner = WebDriverTestRunner(port)

trunk/Tools/Scripts/run-wpe-tests ¶

@@ -18 +18 @@
 # Boston, MA 02110-1301, USA.
 
-from __future__ import print_function
 import logging
 import os

trunk/Tools/Scripts/sampstat ¶

@@ -29 +29 @@
 import fileinput
 from optparse import OptionParser
+from functools import reduce
 
 usage = "usage: %prog [options] [FILES]\n  Compute the mean and 95% confidence interval of a sample set.\n  Standard input or files must contain two or more decimal numbers, one per line."
@@ -89 +90 @@
     for item in results:
         line = "      %.2f %s" % (item, options.unit)
-        print line
+        print(line)
         length = len(line) if len(line) > length else length
 
-    print "-" * length
+    print("-" * length)
 
 prefix = "Mean: " if options.verbose else ""
-print "%s%.2f %s +/- %.2f %s (%.1f%%)" % (prefix, mean, options.unit, confidenceInterval, options.unit, confidencePercent)
+print("%s%.2f %s +/- %.2f %s (%.1f%%)" % (prefix, mean, options.unit, confidenceInterval, options.unit, confidencePercent))
 

trunk/Tools/Scripts/sync-feature-defines ¶

@@ -26 +26 @@
 "Copies the most recently updated FeatureDefines.xcconfig file to all the others."
 
+# A webkitpy import needs to go first for autoinstaller to work with subsequent imports.
+from webkitpy.style.checkers.featuredefines import FEATURE_DEFINE_FILES
+
 import os
 import shutil
-from webkitpy.style.checkers.featuredefines import FEATURE_DEFINE_FILES
+import six
+
 
 newest_file = max(FEATURE_DEFINE_FILES, key=os.path.getctime)
@@ -34 +38 @@
 remaining_files.remove(newest_file)
 
-print "Copy %s to each of: %s " % (newest_file, ", ".join(remaining_files))
-response = raw_input("Continue [Y/n]: ")
+print("Copy %s to each of: %s " % (newest_file, ", ".join(remaining_files)))
+response = six.moves.input("Continue [Y/n]: ")
 
 if not response:

trunk/Tools/Scripts/sync-master-with-upstream ¶

@@ -39 +39 @@
     if subprocess.call(args) != 0:
         if error_message:
-            print error_message
+            print(error_message)
         exit(1)
 
 run(["git", "fetch", "upstream"], "Have you run configure-github-as-upstream to configure an upstream repository?")
 run(["git", "push", "origin", "upstream/master:master"])
-print "\nConsider running 'git merge origin' to update your local branches."
+print("\nConsider running 'git merge origin' to update your local branches.")

trunk/Tools/Scripts/update-wasm-gcc-torture.py ¶

@@ -32 +32 @@
 import sys
 import tarfile
-import urllib2
+
+if sys.version_info > (3, 0):
+    from urllib.request import urlopen
+else:
+    from urllib2 import urlopen
 
 LKGR_URL = 'https://storage.googleapis.com/wasm-llvm/builds/%s/lkgr.json'
@@ -66 +70 @@
     if not args.lkgr:
         print('Downloading: %s' % lkgr_url)
-        args.lkgr = json.loads(urllib2.urlopen(lkgr_url).read())['build']
+        args.lkgr = json.loads(urlopen(lkgr_url).read())['build']
     print('lkgr: %s' % args.lkgr)
 
@@ -75 +79 @@
     if not os.path.exists(torture_file):
         print('Downloading: %s' % torture_url)
-        torture_download = urllib2.urlopen(torture_url)
+        torture_download = urlopen(torture_url)
         with open(torture_file, 'wb') as f:
             f.write(torture_download.read())

trunk/Tools/Scripts/validate-committer-lists ¶

@@ -34 +34 @@
 import logging
 import os
+import re
 import subprocess
-import re
-import urllib2
+import sys
+
 from datetime import date, datetime, timedelta
 from optparse import OptionParser
+
+if sys.version_info > (3, 0):
+    from urllib.request import urlopen
+else:
+    from urllib2 import urlopen
 
 from webkitpy.common.config.committers import CommitterList
@@ -54 +60 @@
     if not list_to_print:
         return
-    print # Newline before the list
-    print title
+    print() # Newline before the list
+    print(title)
     for item in list_to_print:
-        print item
+        print(item)
 
 
@@ -65 +71 @@
 
     def _fetch_emails_from_page(self, url):
-        page = urllib2.urlopen(url)
+        page = urlopen(url)
         soup = BeautifulSoup(page)
 
@@ -94 +100 @@
                 email_to_committer_map[email] = committer
 
-        return filter(lambda email: not email_to_committer_map.get(email), emails)
+        return [email for email in emails if not email_to_committer_map.get(email)]
 
     def check_for_emails_missing_from_list(self, committer_list):
@@ -212 +218 @@
 
     def _fill_in_emails_for_old_logins(self):
-        authors_missing_email = filter(lambda author: author.find('@') == -1, self._last_commit_time_by_author_cache)
-        authors_with_email = filter(lambda author: author.find('@') != -1, self._last_commit_time_by_author_cache)
-        prefixes_of_authors_with_email = map(lambda author: author.split('@')[0], authors_with_email)
+        authors_missing_email = [author for author in self._last_commit_time_by_author_cache if author.find('@') == -1]
+        authors_with_email = [author for author in self._last_commit_time_by_author_cache if author.find('@') != -1]
+        prefixes_of_authors_with_email = [author.split('@')[0] for author in authors_with_email]
 
         for author in authors_missing_email:
@@ -246 +252 @@
     @staticmethod
     def _print_three_column_row(widths, values):
-        print "%s%s%s" % (values[0].ljust(widths[0]), values[1].ljust(widths[1]), values[2])
+        print("%s%s%s" % (values[0].ljust(widths[0]), values[1].ljust(widths[1]), values[2]))
 
     def possibly_expired_committers(self, committer_list):
-        authors_and_last_commits = self._last_commit_by_author().items()
+        authors_and_last_commits = list(self._last_commit_by_author().items())
         authors_and_last_commits.sort(lambda a,b: cmp(a[1], b[1]), reverse=True)
         committer_cutof = date.today() - timedelta(days=365)
@@ -285 +291 @@
         retired_authors_and_last_commits = self.possibly_expired_committers(committer_list)
         column_widths = [13, 25]
-        print
-        print "Committers who have not committed within one year:"
+        print()
+        print("Committers who have not committed within one year:")
         self._print_three_column_row(column_widths, ("Last Commit", "Committer Email", "Committer Record"))
         for (author, last_commit) in retired_authors_and_last_commits:
@@ -297 +303 @@
         
         column_widths = [13, 25]
-        print
-        print "Reviewers who have not reviewed within one year:"
+        print()
+        print("Reviewers who have not reviewed within one year:")
         for contributor in inactive_reviewers:
-            print "\"{}\" {}".format(contributor.full_name.encode("utf-8"), contributor.bugzilla_email())
+            print("\"{}\" {}".format(contributor.full_name.encode("utf-8"), contributor.bugzilla_email()))
 
     def print_committers_missing_from_committer_list(self, committer_list):
@@ -329 +335 @@
 
     def print_committers_with_invalid_bugzilla_emails(self, committer_list):
-        print # Print a newline before we start hitting bugzilla (it logs about logging in).
-        print "Checking committer emails against bugzilla (this will take a long time)"
-        committers_with_invalid_bugzilla_email = filter(self._has_invalid_bugzilla_email, committer_list.committers())
+        print() # Print a newline before we start hitting bugzilla (it logs about logging in).
+        print("Checking committer emails against bugzilla (this will take a long time)")
+        committers_with_invalid_bugzilla_email = list(filter(self._has_invalid_bugzilla_email, committer_list.committers()))
         print_list_if_non_empty("Committers with invalid bugzilla email:", committers_with_invalid_bugzilla_email)
 
@@ -342 +348 @@
         return "<{0}@268f45cc-cd09-0410-ab3c-d52691b4dbfc>".format(email)        
 
-    email_to_legacy_username = dict(map(reversed, CommitterListFromGit.login_to_email_address.items()))
+    email_to_legacy_username = dict(list(map(reversed, list(CommitterListFromGit.login_to_email_address.items()))))
     def map_emails_to_legacy_username(emails):
         legacy_username = None
@@ -360 +366 @@
 
         for other_email in other_emails:
-            print full_name, format_email(canonical_email), format_email(other_email)
-            print full_name, format_email(canonical_email), format_email_with_uuid(other_email)
+            print(full_name, format_email(canonical_email), format_email(other_email))
+            print(full_name, format_email(canonical_email), format_email_with_uuid(other_email))
 
 
@@ -375 +381 @@
     committer_list = CommitterList()
     if options.dump:
-        print committer_list.as_json()
+        print(committer_list.as_json())
         return 0
 
@@ -383 +389 @@
 
     if options.canonicalize:
-        print "Updating contributors.json in-place..."
+        print("Updating contributors.json in-place...")
         committer_list.reformat_in_place()
-        print "Done"
+        print("Done")
         return 0
 
@@ -391 +397 @@
  
     if not Git.in_working_directory("."):
-        print """\n\nWARNING: validate-committer-lists requires a git checkout.
+        print("""\n\nWARNING: validate-committer-lists requires a git checkout.
 The following checks are disabled:
  - List of inactive committers
  - List of inactive reviewers
  - List of historical committers missing from contributors.json
-"""
+""")
         return 1