diff --git a/gclient.py b/gclient.py index a7cddc780..6b5fa3f26 100755 --- a/gclient.py +++ b/gclient.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 7f8b8c376..5d7ba912f 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -58,12 +58,12 @@ Recipe module to ensure a checkout is consistent on a bot. Wrapper for easy calling of bot_update. -— **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#532)(self, bot_update_step):** +— **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#534)(self, bot_update_step):** Deapplies a patch, taking care of DEPS and solution revisions properly. -— **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#79)(self, gclient_config=None, suffix=None, patch=True, update_presentation=True, patch_root=None, with_branch_heads=False, with_tags=False, no_fetch_tags=False, refs=None, patch_oauth2=None, oauth2_json=None, use_site_config_creds=None, clobber=False, root_solution_revision=None, rietveld=None, issue=None, patchset=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, disable_syntax_validation=False, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, \*\*kwargs):** +— **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#81)(self, gclient_config=None, suffix=None, patch=True, update_presentation=True, patch_root=None, with_branch_heads=False, with_tags=False, no_fetch_tags=False, refs=None, patch_oauth2=None, oauth2_json=None, use_site_config_creds=None, clobber=False, root_solution_revision=None, rietveld=None, issue=None, patchset=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, disable_syntax_validation=False, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, \*\*kwargs):** Args: * gclient_config: The gclient configuration to use when running bot_update. @@ -95,7 +95,7 @@ Args: bot_update module ONLY supports one change. Users may specify a change via tryserver.set_change() and explicitly set this flag False. -— **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#509)(self, project_name, gclient_config=None):** +— **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#511)(self, project_name, gclient_config=None):** Returns all property names used for storing the checked-out revision of a given project. @@ -109,9 +109,9 @@ Args: Returns (list of str): All properties that'll hold the checked-out revision of the given project. An empty list if no such properties exist. -  **@property**
— **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#47)(self):** +  **@property**
— **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#49)(self):** -— **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#460)(self, bot_update_json, name):** +— **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#462)(self, bot_update_json, name):** Sets a fixed revision for a single dependency using project revision properties. diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index abc568496..899c626cf 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -42,7 +42,9 @@ class BotUpdateApi(recipe_api.RecipeApi): self.m.buildbucket.build.id) with self.m.context(env=env): with self.m.depot_tools.on_path(): - return self.m.python(name, bot_update_path, cmd, **kwargs) + return self.m.step(name, + ['python3', '-u', bot_update_path] + cmd, + **kwargs) @property def last_returned_properties(self): diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json index e8c1df138..d2d76a9e0 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json index 52cc689b9..c1116d4ff 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json index a321f17c6..5e94c47c2 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json index b01001852..79aa0f5ae 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json b/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json index 615e59b98..c83728ab9 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json index 9b94b78b4..8abd6323b 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -113,7 +113,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json index bd7132ca5..534ea26ee 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -146,7 +146,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json index ec8ff260b..9d0b17571 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -113,7 +113,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json index bb7298cf1..ea906adee 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -113,7 +113,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json b/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json index ae9f9b1b9..aad3ae1da 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -123,7 +123,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json b/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json index d36d81d0f..7fe905403 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -116,7 +116,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json index 1d5b0445b..ffc8b66ef 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -186,7 +186,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json index 484464702..a98a36086 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json index ee0c1ddcc..bbf691e1d 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json index 58405ebba..c917eff40 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_main.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_main.json index f8e975a9a..6c95cf6f3 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_main.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_main.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/origin_main.json b/recipes/recipe_modules/bot_update/examples/full.expected/origin_main.json index 9dba48ff2..4820e0815 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/origin_main.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/origin_main.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json index 0726ae681..d2d55ba79 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -114,7 +114,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json b/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json index caf14c225..52093ffe2 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -112,7 +112,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json b/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json index a321f17c6..5e94c47c2 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json b/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json index 67acde5e8..028bfd0c0 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json b/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json index 61b737af3..c905c47d3 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json index 2a6300da8..dc3859d30 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json index 594ad96cb..e6698164d 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json index bf3282a12..00a05c75c 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json index 1d5b0445b..ffc8b66ef 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -186,7 +186,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json index 67e770228..50b931fd1 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -185,7 +185,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json index 91da74bee..dc591d5a8 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -185,7 +185,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json index 8619d30fb..8cbda2ed5 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -186,7 +186,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json index 493c035f0..41d0057b6 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -196,7 +196,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json index af4774afe..31a02c674 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -186,7 +186,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json index 42658f6a7..0510ff58c 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json @@ -56,7 +56,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -186,7 +186,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json b/recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json index 88ede5f0a..b4b1f84da 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -113,7 +113,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json index 1822b7c1c..614dccee2 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", @@ -113,7 +113,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index bbb77512c..32c0825a6 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2014 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -231,7 +231,7 @@ def call(*args, **kwargs): # pragma: no cover if not buf: break if hanging_cr: - buf = '\r' + buf + buf = b'\r' + buf hanging_cr = buf.endswith(b'\r') if hanging_cr: buf = buf[:-1] diff --git a/recipes/recipe_modules/gclient/api.py b/recipes/recipe_modules/gclient/api.py index ff7d8c16e..758ed0e7c 100644 --- a/recipes/recipe_modules/gclient/api.py +++ b/recipes/recipe_modules/gclient/api.py @@ -100,11 +100,11 @@ class GclientApi(recipe_api.RecipeApi): self.m.buildbucket.build.builder.builder, self.m.buildbucket.build.id) with self.m.context(env=env, env_suffixes=env_suffixes): - return self.m.python(prefix + name, - self.repo_resource('gclient.py'), - cmd, - infra_step=infra_step, - **kwargs) + cmd = ['python3', '-u', self.repo_resource('gclient.py')] + cmd + return self.m.step(prefix + name, + cmd, + infra_step=infra_step, + **kwargs) @property def use_mirror(self): diff --git a/recipes/recipe_modules/gclient/examples/full.expected/basic.json b/recipes/recipe_modules/gclient/examples/full.expected/basic.json index 3eee826c8..74f6f075d 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/basic.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/basic.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -18,7 +18,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -55,7 +55,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -74,7 +74,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -93,7 +93,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -111,7 +111,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -155,7 +155,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -175,7 +175,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -220,7 +220,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "runhooks" diff --git a/recipes/recipe_modules/gclient/examples/full.expected/revision.json b/recipes/recipe_modules/gclient/examples/full.expected/revision.json index 7ae83c862..f9d42ee46 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/revision.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/revision.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -33,7 +33,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -87,7 +87,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -121,7 +121,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -155,7 +155,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -188,7 +188,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -247,7 +247,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -282,7 +282,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -354,7 +354,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "runhooks" diff --git a/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json b/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json index f9566201d..4771fd068 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json @@ -1,7 +1,7 @@ [ { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -33,7 +33,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -85,7 +85,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -119,7 +119,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -153,7 +153,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "config", @@ -186,7 +186,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "sync", @@ -245,7 +245,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -280,7 +280,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", @@ -352,7 +352,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "runhooks" diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json index ace8499b5..6e6c76dfa 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/basic.json @@ -27,7 +27,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json index 2d9e9b2d3..04e47e394 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/dont have revision yet.json @@ -27,7 +27,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json index 27c63437d..e70c9f0fe 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/no change, exception.json @@ -27,7 +27,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]/gclient.py", "recurse", diff --git a/recipes/recipe_modules/gclient/tests/diff_deps.expected/windows.json b/recipes/recipe_modules/gclient/tests/diff_deps.expected/windows.json index 2eb4b8f37..a4079ff53 100644 --- a/recipes/recipe_modules/gclient/tests/diff_deps.expected/windows.json +++ b/recipes/recipe_modules/gclient/tests/diff_deps.expected/windows.json @@ -27,7 +27,7 @@ }, { "cmd": [ - "python", + "python3", "-u", "RECIPE_REPO[depot_tools]\\gclient.py", "recurse",