Changeset 225724 in webkit


Ignore:
Timestamp:
Dec 9, 2017 8:58:36 AM (6 years ago)
Author:
Konstantin Tokarev
Message:

[python] Replace print >> operator with print() function for python3 compatibility
​https://bugs.webkit.org/show_bug.cgi?id=180611

Reviewed by Michael Catanzaro.

Source/JavaScriptCore:

  • Scripts/make-js-file-arrays.py:

(main):

Tools:

  • CygwinDownloader/cygwin-downloader.py:

(download_url_to_file):

  • Scripts/webkitpy/common/system/profiler.py:

(Perf.profile_after_exit):

  • Scripts/webkitpy/common/version_check.py:
  • Scripts/webkitpy/layout_tests/lint_test_expectations.py:

(main):

  • Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(main):

  • Scripts/webkitpy/layout_tests/servers/run_webkit_httpd.py:

(run_server):

  • Scripts/webkitpy/tool/commands/analyzechangelog.py:

(ChangeLogAnalyzer._print_status):

  • Scripts/webkitpy/tool/commands/queries.py:

(BugsToCommit.execute):
(PatchesInCommitQueue.execute):
(PatchesToCommitQueue.execute):
(PatchesToReview._print_report):
(WhatBroke._print_builder_line):
(WhatBroke._print_blame_information_for_builder):
(WhatBroke.execute):
(ResultsFor._print_layout_test_results):
(ResultsFor.execute):
(FailureReason._print_blame_information_for_transition):
(FailureReason._explain_failures_for_builder):
(FailureReason._builder_to_explain):
(FailureReason.execute):
(FindFlakyTests._find_failures):
(FindFlakyTests._print_statistics):
(FindFlakyTests._walk_backwards_from):
(execute):
(PrintExpectations.execute):
(PrintBaselines.execute):
(PrintBaselines._print_baselines):
(FindResolvedBugs.execute):

  • Scripts/webkitpy/tool/commands/rebaseline.py:

(AbstractParallelRebaselineCommand._run_webkit_patch):
(AbstractParallelRebaselineCommand._rebaseline):

  • Scripts/webkitpy/tool/servers/gardeningserver.py:

(GardeningHTTPRequestHandler.rebaselineall):

  • Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:

(GardeningServerTest.disabled_test_rebaselineall.run_command):
(GardeningServerTest):

Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r225709 r225724  
     12017-12-09  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [python] Replace print >> operator with print() function for python3 compatibility
     4        https://bugs.webkit.org/show_bug.cgi?id=180611
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * Scripts/make-js-file-arrays.py:
     9        (main):
     10
    1112017-12-08  Joseph Pecoraro  <pecoraro@apple.com>
    212

  • trunk/Source/JavaScriptCore/Scripts/make-js-file-arrays.py

    r225698 r225724  
    2222# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
     24from __future__ import print_function
    2425import io
    2526import os
    … …  
    6162
    6263    headerFile = open(headerPath, 'w')
    63     print >> headerFile, 'namespace {0:s} {{'.format(namespace)
     64    print('namespace {0:s} {{'.format(namespace), file=headerFile)
    6465
    6566    sourceFile = open(sourcePath, 'w')
    66     print >> sourceFile, '#include "{0:s}"'.format(os.path.basename(headerPath))
    67     print >> sourceFile, 'namespace {0:s} {{'.format(namespace)
     67    print('#include "{0:s}"'.format(os.path.basename(headerPath)), file=sourceFile)
     68    print('namespace {0:s} {{'.format(namespace), file=sourceFile)
    6869
    6970    jsm = JavascriptMinify()
    … …  
    8283        variableName = os.path.splitext(os.path.basename(inputFileName))[0]
    8384
    84         print >> headerFile, 'extern const char {0:s}JavaScript[{1:d}];'.format(variableName, size)
    85         print >> sourceFile, 'const char {0:s}JavaScript[{1:d}] = {{'.format(variableName, size)
     85        print('extern const char {0:s}JavaScript[{1:d}];'.format(variableName, size), file=headerFile)
     86        print('const char {0:s}JavaScript[{1:d}] = {{'.format(variableName, size), file=sourceFile)
    8687
    8788        codepoints = map(ord, characters)
    8889        for codepointChunk in chunk(codepoints, 16):
    89             print >> sourceFile, '    {0:s},'.format(','.join(map(stringifyCodepoint, codepointChunk)))
     90            print('    {0:s},'.format(','.join(map(stringifyCodepoint, codepointChunk))), file=sourceFile)
    9091
    91         print >> sourceFile, '};'
     92        print('};', file=sourceFile)
    9293
    93     print >> headerFile, '}} // namespace {0:s}'.format(namespace)
    94     print >> sourceFile, '}} // namespace {0:s}'.format(namespace)
     94    print('}} // namespace {0:s}'.format(namespace), file=headerFile)
     95    print('}} // namespace {0:s}'.format(namespace), file=sourceFile)
    9596
    9697if __name__ == '__main__':

  • trunk/Tools/ChangeLog

    r225722 r225724  
     12017-12-09  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [python] Replace print >> operator with print() function for python3 compatibility
     4        https://bugs.webkit.org/show_bug.cgi?id=180611
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * CygwinDownloader/cygwin-downloader.py:
     9        (download_url_to_file):
     10        * Scripts/webkitpy/common/system/profiler.py:
     11        (Perf.profile_after_exit):
     12        * Scripts/webkitpy/common/version_check.py:
     13        * Scripts/webkitpy/layout_tests/lint_test_expectations.py:
     14        (main):
     15        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
     16        (main):
     17        * Scripts/webkitpy/layout_tests/servers/run_webkit_httpd.py:
     18        (run_server):
     19        * Scripts/webkitpy/tool/commands/analyzechangelog.py:
     20        (ChangeLogAnalyzer._print_status):
     21        * Scripts/webkitpy/tool/commands/queries.py:
     22        (BugsToCommit.execute):
     23        (PatchesInCommitQueue.execute):
     24        (PatchesToCommitQueue.execute):
     25        (PatchesToReview._print_report):
     26        (WhatBroke._print_builder_line):
     27        (WhatBroke._print_blame_information_for_builder):
     28        (WhatBroke.execute):
     29        (ResultsFor._print_layout_test_results):
     30        (ResultsFor.execute):
     31        (FailureReason._print_blame_information_for_transition):
     32        (FailureReason._explain_failures_for_builder):
     33        (FailureReason._builder_to_explain):
     34        (FailureReason.execute):
     35        (FindFlakyTests._find_failures):
     36        (FindFlakyTests._print_statistics):
     37        (FindFlakyTests._walk_backwards_from):
     38        (execute):
     39        (PrintExpectations.execute):
     40        (PrintBaselines.execute):
     41        (PrintBaselines._print_baselines):
     42        (FindResolvedBugs.execute):
     43        * Scripts/webkitpy/tool/commands/rebaseline.py:
     44        (AbstractParallelRebaselineCommand._run_webkit_patch):
     45        (AbstractParallelRebaselineCommand._rebaseline):
     46        * Scripts/webkitpy/tool/servers/gardeningserver.py:
     47        (GardeningHTTPRequestHandler.rebaselineall):
     48        * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
     49        (GardeningServerTest.disabled_test_rebaselineall.run_command):
     50        (GardeningServerTest):
     51
    1522017-12-08  Basuke Suzuki  <Basuke.Suzuki@sony.com>
    253

  • trunk/Tools/CygwinDownloader/cygwin-downloader.py

    r167430 r225724  
    11#!/usr/bin/env python
    22
     3from __future__ import print_function
    34import os, random, sys, time, urllib
    45
    … …  
    2223def download_url_to_file(url, file, message):
    2324        if not quiet:
    24                 print message + " ",
     25                print(message + " ", end=' ')
    2526        if not dry_run:
    2627                dir = os.path.dirname(file)
    … …  
    2930                urllib.urlretrieve(url, file, download_progress_hook)
    3031        if not quiet:
    31                 print
     32                print()
    3233 
    3334# This is mostly just the list of North America http mirrors from http://cygwin.com/mirrors.html,
    … …  
    8081#
    8182
    82 print "Using Cygwin mirror server " + package_mirror_url + " to download setup.ini..."
     83print("Using Cygwin mirror server " + package_mirror_url + " to download setup.ini...")
    8384
    8485urllib.urlretrieve(package_mirror_url + "x86/setup.ini", "setup.ini.orig")
    … …  
    151152seconds_to_sleep = 10
    152153
    153 print """
     154print("""
    154155Finished downloading Cygwin. In %d seconds,
    155156I will run setup.exe. All the suitable options have
    156157been already selected for you.
    157 """ % (seconds_to_sleep)
     158""" % (seconds_to_sleep))
    158159
    159160
    160161while seconds_to_sleep > 0:
    161         print "%d..." % seconds_to_sleep,
     162        print("%d..." % seconds_to_sleep, end=' ')
    162163        sys.stdout.flush()
    163164        time.sleep(1)
    164165        seconds_to_sleep -= 1
    165 print
     166print()
    166167
    167168if not dry_run:

  • trunk/Tools/Scripts/webkitpy/common/system/profiler.py

    r225698 r225724  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
     29from __future__ import print_function
    2930import logging
    3031import re
    … …  
    170171        exit_code = self._wait_process.poll()
    171172        if exit_code is not 0:
    172             print "'perf record' failed, ",
     173            print("'perf record' failed, ", end=' ')
    173174            if exit_code:
    174175                print("exit code was %i." % exit_code)

  • trunk/Tools/Scripts/webkitpy/common/version_check.py

    r174102 r225724  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
     29from __future__ import print_function
    2930import sys
    3031
    3132if sys.version < '2.7' or sys.version >= '2.8':
    32     print >> sys.stderr, "Unsupported Python version: WebKit only supports 2.7.x, and you're running %s." % sys.version.split()[0]
     33    print("Unsupported Python version: WebKit only supports 2.7.x, and you're running %s." % sys.version.split()[0], file=sys.stderr)
    3334    sys.exit(1)

  • trunk/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py

    r160756 r225724  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
     29from __future__ import print_function
    2930import logging
    3031import optparse
    … …  
    106107        exit_status = INTERRUPTED_EXIT_STATUS
    107108    except Exception as e:
    108         print >> stderr, '\n%s raised: %s' % (e.__class__.__name__, str(e))
     109        print('\n%s raised: %s' % (e.__class__.__name__, str(e)), file=stderr)
    109110        traceback.print_exc(file=stderr)
    110111        exit_status = EXCEPTIONAL_EXIT_STATUS

  • trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

    r223765 r225724  
    2929# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    3030
     31from __future__ import print_function
    3132import logging
    3233import optparse
    … …  
    7172    except NotImplementedError, e:
    7273        # FIXME: is this the best way to handle unsupported port names?
    73         print >> stderr, str(e)
     74        print(str(e), file=stderr)
    7475        return EXCEPTIONAL_EXIT_STATUS
    7576
    … …  
    9394    except BaseException as e:
    9495        if isinstance(e, Exception):
    95             print >> stderr, '\n%s raised: %s' % (e.__class__.__name__, str(e))
     96            print('\n%s raised: %s' % (e.__class__.__name__, str(e)), file=stderr)
    9697            traceback.print_exc(file=stderr)
    9798        return EXCEPTIONAL_EXIT_STATUS

  • trunk/Tools/Scripts/webkitpy/layout_tests/servers/run_webkit_httpd.py

    r225698 r225724  
    2929# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    3030
     31from __future__ import print_function
    3132import optparse
    3233import subprocess
    … …  
    6566        port = host.port_factory.get(options.platform, options)
    6667    except NotImplementedError, e:
    67         print >> stderr, str(e)
     68        print(str(e), file=stderr)
    6869        return EXCEPTIONAL_EXIT_STATUS
    6970

  • trunk/Tools/Scripts/webkitpy/tool/commands/analyzechangelog.py

    r225698 r225724  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
     29from __future__ import print_function
    2930import json
    3031import re
    … …  
    126127    def _print_status(self, status):
    127128        if self._length_of_previous_output:
    128             print "\r" + " " * self._length_of_previous_output,
     129            print("\r" + " " * self._length_of_previous_output, end=' ')
    129130        new_output = ('%' + str(self._longest_filename) + 's: %s') % (self._filename, status)
    130         print "\r" + new_output,
     131        print("\r" + new_output, end=' ')
    131132        self._length_of_previous_output = len(new_output)
    132133

  • trunk/Tools/Scripts/webkitpy/tool/commands/queries.py

    r216776 r225724  
    3030# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    3131
     32from __future__ import print_function
    3233import fnmatch
    3334import logging
    … …  
    7576        bug_ids = tool.bugs.queries.fetch_bug_ids_from_commit_queue()
    7677        for bug_id in bug_ids:
    77             print "%s" % bug_id
     78            print("%s" % bug_id)
    7879
    7980
    … …  
    8687        _log.info("Patches in commit queue:")
    8788        for patch in patches:
    88             print patch.url()
     89            print(patch.url())
    8990
    9091
    … …  
    118119            bugs_needing_cq = sorted(set(bugs_needing_cq))
    119120            for bug_id in bugs_needing_cq:
    120                 print "%s" % tool.bugs.bug_url_for_bug_id(bug_id)
     121                print("%s" % tool.bugs.bug_url_for_bug_id(bug_id))
    121122        else:
    122123            for patch in patches_needing_cq:
    123                 print "%s" % tool.bugs.attachment_url_for_id(patch.id(), action="edit")
     124                print("%s" % tool.bugs.attachment_url_for_id(patch.id(), action="edit"))
    124125
    125126
    … …  
    141142    def _print_report(self, report, cc_email, print_all):
    142143        if print_all:
    143             print "Bugs with attachments pending review:"
     144            print("Bugs with attachments pending review:")
    144145        else:
    145             print "Bugs with attachments pending review that has %s in the CC list:" % cc_email
    146 
    147         print "http://webkit.org/b/bugid   Description (age in days)"
     146            print("Bugs with attachments pending review that has %s in the CC list:" % cc_email)
     147
     148        print("http://webkit.org/b/bugid   Description (age in days)")
    148149        for row in report:
    149             print "%s (%d)" % (row[1], row[0])
    150 
    151         print "Total: %d" % len(report)
     150            print("%s (%d)" % (row[1], row[0]))
     151
     152        print("Total: %d" % len(report))
    152153
    153154    def _generate_report(self, bugs, include_cq_denied):
    … …  
    183184
    184185    def _print_builder_line(self, builder_name, max_name_width, status_message):
    185         print "%s : %s" % (builder_name.ljust(max_name_width), status_message)
     186        print("%s : %s" % (builder_name.ljust(max_name_width), status_message))
    186187
    187188    def _print_blame_information_for_builder(self, builder_status, name_width, avoid_flakey_tests=True):
    … …  
    204205            commit_info = self._tool.checkout().commit_info_for_revision(revision)
    205206            if commit_info:
    206                 print commit_info.blame_string(self._tool.bugs)
     207                print(commit_info.blame_string(self._tool.bugs))
    207208            else:
    208                 print "FAILED to fetch CommitInfo for r%s, likely missing ChangeLog" % revision
     209                print("FAILED to fetch CommitInfo for r%s, likely missing ChangeLog" % revision)
    209210
    210211    def execute(self, options, args, tool):
    … …  
    219220            failing_builders += 1
    220221        if failing_builders:
    221             print "%s of %s are failing" % (failing_builders, pluralize(len(builder_statuses), "builder"))
     222            print("%s of %s are failing" % (failing_builders, pluralize(len(builder_statuses), "builder")))
    222223        else:
    223             print "All builders are passing!"
     224            print("All builders are passing!")
    224225
    225226
    … …  
    231232    def _print_layout_test_results(self, results):
    232233        if not results:
    233             print " No results."
     234            print(" No results.")
    234235            return
    235236        for title, files in results.parsed_results().items():
    236             print " %s" % title
     237            print(" %s" % title)
    237238            for filename in files:
    238                 print "  %s" % filename
     239                print("  %s" % filename)
    239240
    240241    def execute(self, options, args, tool):
    241242        builders = self._tool.buildbot.builders()
    242243        for builder in builders:
    243             print "%s:" % builder.name()
     244            print("%s:" % builder.name())
    244245            build = builder.build_for_revision(args[0], allow_failed_lookups=True)
    245246            self._print_layout_test_results(build.layout_test_results())
    … …  
    262263    def _print_blame_information_for_transition(self, regression_window, failing_tests):
    263264        red_build = regression_window.failing_build()
    264         print "SUCCESS: Build %s (r%s) was the first to show failures: %s" % (red_build._number, red_build.revision(), failing_tests)
    265         print "Suspect revisions:"
     265        print("SUCCESS: Build %s (r%s) was the first to show failures: %s" % (red_build._number, red_build.revision(), failing_tests))
     266        print("Suspect revisions:")
    266267        for revision in regression_window.revisions():
    267             print self._blame_line_for_revision(revision)
     268            print(self._blame_line_for_revision(revision))
    268269
    269270    def _explain_failures_for_builder(self, builder, start_revision):
    270         print "Examining failures for \"%s\", starting at r%s" % (builder.name(), start_revision)
     271        print("Examining failures for \"%s\", starting at r%s" % (builder.name(), start_revision))
    271272        revision_to_test = start_revision
    272273        build = builder.build_for_revision(revision_to_test, allow_failed_lookups=True)
    … …  
    274275        if not layout_test_results:
    275276            # FIXME: This could be made more user friendly.
    276             print "Failed to load layout test results from %s; can't continue. (start revision = r%s)" % (build.results_url(), start_revision)
     277            print("Failed to load layout test results from %s; can't continue. (start revision = r%s)" % (build.results_url(), start_revision))
    277278            return 1
    278279
    279280        results_to_explain = set(layout_test_results.failing_tests())
    280281        last_build_with_results = build
    281         print "Starting at %s" % revision_to_test
     282        print("Starting at %s" % revision_to_test)
    282283        while results_to_explain and not self._done_explaining():
    283284            revision_to_test -= 1
    284285            new_build = builder.build_for_revision(revision_to_test, allow_failed_lookups=True)
    285286            if not new_build:
    286                 print "No build for %s" % revision_to_test
     287                print("No build for %s" % revision_to_test)
    287288                continue
    288289            build = new_build
    289290            latest_results = build.layout_test_results()
    290291            if not latest_results:
    291                 print "No results build %s (r%s)" % (build._number, build.revision())
     292                print("No results build %s (r%s)" % (build._number, build.revision()))
    292293                continue
    293294            failures = set(latest_results.failing_tests())
    … …  
    295296                # FIXME: We may need to move this logic into the LayoutTestResults class.
    296297                # The buildbot stops runs after 500 failures so we don't have full results to work with here.
    297                 print "Too many failures in build %s (r%s), ignoring." % (build._number, build.revision())
     298                print("Too many failures in build %s (r%s), ignoring." % (build._number, build.revision()))
    298299                continue
    299300            fixed_results = results_to_explain - failures
    300301            if not fixed_results:
    301                 print "No change in build %s (r%s), %s unexplained failures (%s in this build)" % (build._number, build.revision(), len(results_to_explain), len(failures))
     302                print("No change in build %s (r%s), %s unexplained failures (%s in this build)" % (build._number, build.revision(), len(results_to_explain), len(failures)))
    302303                last_build_with_results = build
    303304                continue
    … …  
    308309            results_to_explain -= fixed_results
    309310        if results_to_explain:
    310             print "Failed to explain failures: %s" % results_to_explain
     311            print("Failed to explain failures: %s" % results_to_explain)
    311312            return 1
    312         print "Explained all results for %s" % builder.name()
     313        print("Explained all results for %s" % builder.name())
    313314        return 0
    314315
    … …  
    316317        builder_statuses = self._tool.buildbot.builder_statuses()
    317318        red_statuses = [status for status in builder_statuses if not status["is_green"]]
    318         print "%s failing" % (pluralize(len(red_statuses), "builder"))
     319        print("%s failing" % (pluralize(len(red_statuses), "builder")))
    319320        builder_choices = [status["name"] for status in red_statuses]
    320321        # We could offer an "All" choice here.
    … …  
    337338        self.explained_failures = set()
    338339        if not start_revision:
    339             print "Revision required."
     340            print("Revision required.")
    340341            return 1
    341342        return self._explain_failures_for_builder(builder, start_revision=int(start_revision))
    … …  
    349350        build = builder.build_for_revision(revision, allow_failed_lookups=True)
    350351        if not build:
    351             print "No build for %s" % revision
     352            print("No build for %s" % revision)
    352353            return (None, None)
    353354        results = build.layout_test_results()
    354355        if not results:
    355             print "No results build %s (r%s)" % (build._number, build.revision())
     356            print("No results build %s (r%s)" % (build._number, build.revision()))
    356357            return (None, None)
    357358        failures = set(results.failing_tests())
    … …  
    359360            # FIXME: We may need to move this logic into the LayoutTestResults class.
    360361            # The buildbot stops runs after 20 failures so we don't have full results to work with here.
    361             print "Too many failures in build %s (r%s), ignoring." % (build._number, build.revision())
     362            print("Too many failures in build %s (r%s), ignoring." % (build._number, build.revision()))
    362363            return (None, None)
    363364        return (build, failures)
    … …  
    369370
    370371    def _print_statistics(self, statistics):
    371         print "=== Results ==="
    372         print "Occurrences Test name"
     372        print("=== Results ===")
     373        print("Occurrences Test name")
    373374        for value, key in sorted([(value, key) for key, value in statistics.items()]):
    374             print "%10d %s" % (value, key)
     375            print("%10d %s" % (value, key))
    375376
    376377    def _walk_backwards_from(self, builder, start_revision, limit):
    … …  
    381382        for i in range(limit):
    382383            revision = start_revision - i
    383             print "Analyzing %s ... " % revision,
     384            print("Analyzing %s ... " % revision, end=' ')
    384385            (build, failures) = self._find_failures(builder, revision)
    385386            if failures == None:
    386387                # Notice that we don't loop on the empty set!
    387388                continue
    388             print "has %s failures" % len(failures)
     389            print("has %s failures" % len(failures))
    389390            flaky_tests = one_time_previous_failures - failures
    390391            if flaky_tests:
    391                 print "Flaky tests: %s %s" % (sorted(flaky_tests),
    392                                               previous_build.results_url())
     392                print("Flaky tests: %s %s" % (sorted(flaky_tests),
     393                                              previous_build.results_url()))
    393394            self._increment_statistics(flaky_tests, flaky_test_statistics)
    394395            one_time_previous_failures = failures - all_previous_failures
    … …  
    420421        for builder in tool.buildbot.builder_statuses():
    421422            status_string = "ok" if builder["is_green"] else "FAIL"
    422             print "%s : %s" % (status_string.ljust(4), builder["name"])
     423            print("%s : %s" % (status_string.ljust(4), builder["name"]))
    423424
    424425
    … …  
    436437        if len(args) > 1:
    437438            pid = int(args[1])
    438         print crash_logs.find_newest_log(args[0], pid)
     439        print(crash_logs.find_newest_log(args[0], pid))
    439440
    440441
    … …  
    464465    def execute(self, options, args, tool):
    465466        if not options.paths and not args and not options.all:
    466             print "You must either specify one or more test paths or --all."
     467            print("You must either specify one or more test paths or --all.")
    467468            return
    468469
    … …  
    474475                    port_names = [default_port.name()]
    475476                else:
    476                     print "No port names match '%s'" % options.platform
     477                    print("No port names match '%s'" % options.platform)
    477478                    return
    478479            else:
    … …  
    488489                if file.startswith(layout_tests_dir):
    489490                    file = file.replace(layout_tests_dir, 'LayoutTests')
    490                 print file
     491                print(file)
    491492            return
    492493
    … …  
    497498            lines = [model.get_expectation_line(test) for test in sorted(tests_to_print)]
    498499            if port_name != port_names[0]:
    499                 print
    500             print '\n'.join(self._format_lines(options, port_name, lines))
     500                print()
     501            print('\n'.join(self._format_lines(options, port_name, lines)))
    501502
    502503    def _filter_tests(self, options, model, tests):
    … …  
    548549    def execute(self, options, args, tool):
    549550        if not args and not options.all:
    550             print "You must either specify one or more test paths or --all."
     551            print("You must either specify one or more test paths or --all.")
    551552            return
    552553
    … …  
    555556            port_names = fnmatch.filter(tool.port_factory.all_port_names(), options.platform)
    556557            if not port_names:
    557                 print "No port names match '%s'" % options.platform
     558                print("No port names match '%s'" % options.platform)
    558559        else:
    559560            port_names = [default_port.name()]
    … …  
    564565        for port_name in port_names:
    565566            if port_name != port_names[0]:
    566                 print
     567                print()
    567568            if not options.csv:
    568                 print "// For %s" % port_name
     569                print("// For %s" % port_name)
    569570            port = tool.port_factory.get(port_name)
    570571            for test_name in tests:
    … …  
    576577            if baseline_location:
    577578                if options.csv:
    578                     print "%s,%s,%s,%s,%s,%s" % (port_name, test_name, self._platform_for_path(test_name),
    579                                                  extension[1:], baseline_location, self._platform_for_path(baseline_location))
     579                    print("%s,%s,%s,%s,%s,%s" % (port_name, test_name, self._platform_for_path(test_name),
     580                                                 extension[1:], baseline_location, self._platform_for_path(baseline_location)))
    580581                else:
    581                     print baseline_location
     582                    print(baseline_location)
    582583
    583584    def _platform_for_path(self, relpath):
    … …  
    596597        filename = args[0]
    597598        if not tool.filesystem.isfile(filename):
    598             print "The given path is not a file, please pass a valid path."
     599            print("The given path is not a file, please pass a valid path.")
    599600            return
    600601
    … …  
    612613        for i, bugid in enumerate(ids, start=1):
    613614            bug = bugzilla.fetch_bug(bugid)
    614             print "Checking bug %s \t [%d/%d]" % (bugid, i, num_of_bugs)
     615            print("Checking bug %s \t [%d/%d]" % (bugid, i, num_of_bugs))
    615616            if not bug.is_open():
    616617                resolved_ids.add(bugid)
    617618
    618         print "Resolved bugs in %s :" % (filename)
     619        print("Resolved bugs in %s :" % (filename))
    619620        for bugid in resolved_ids:
    620             print "https://bugs.webkit.org/show_bug.cgi?id=%s" % (bugid)
     621            print("https://bugs.webkit.org/show_bug.cgi?id=%s" % (bugid))

  • trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

    r225698 r225724  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
     29from __future__ import print_function
    2930import json
    3031import logging
    … …  
    206207            stderr = self._tool.executive.run_command([self._tool.path()] + verbose_args + args, cwd=self._tool.scm().checkout_root, return_stderr=True)
    207208            for line in stderr.splitlines():
    208                 print >> sys.stderr, line
     209                print(line, file=sys.stderr)
    209210        except ScriptError, e:
    210211            _log.error(e)
    … …  
    280281        for line in log_output.split('\n'):
    281282            if line:
    282                 print >> sys.stderr, line  # FIXME: Figure out how to log properly.
     283                print(line, file=sys.stderr)  # FIXME: Figure out how to log properly.
    283284
    284285        files_to_add = self._files_to_add(command_results)

  • trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py

    r148502 r225724  
    2323# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424
     25from __future__ import print_function
    2526import BaseHTTPServer
    2627import SocketServer
    … …  
    9596        _log.debug("calling %s, input='%s'", command, json_input)
    9697        return_code, output, error = self._run_webkit_patch(command, json_input)
    97         print >> sys.stderr, error
     98        print(error, file=sys.stderr)
    9899        if return_code:
    99100            _log.error("rebaseline-json failed: %d, output='%s'" % (return_code, output))

  • trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py

    r225698 r225724  
    2727# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2828
     29from __future__ import print_function
    2930import json
    3031import sys
    … …  
    104105
    105106        def run_command(args, cwd=None, input=None, **kwargs):
    106             print >> sys.stderr, "MOCK run_command: %s, cwd=%s, input=%s" % (args, cwd, input)
     107            print("MOCK run_command: %s, cwd=%s, input=%s" % (args, cwd, input), file=sys.stderr)
    107108            return self.output.pop(0)
    108109
Note: See TracChangeset for help on using the changeset viewer.