From 987971208958de7c60e625a8b02a82fe93d5a48e Mon Sep 17 00:00:00 2001
From: Brian Sheedy <bsheedy@chromium.org>
Date: Fri, 21 Oct 2022 20:18:52 +0000
Subject: [PATCH] Run recipe git_cl under Python 3

Makes the git_cl recipe module use vpython3 instead of vpython, as
the latter breaks when running on builders with the omit_python2
experiment.

Bug: 1366965
Recipe-Nontrivial-Roll: build
Recipe-Nontrivial-Roll: build_limited
Recipe-Nontrivial-Roll: chromiumos
Recipe-Nontrivial-Roll: infra
Change-Id: I2306e97dbc7b75201024b5dcf1892787185d5f77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3968801
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
---
 recipes/recipe_modules/git_cl/api.py               |  2 +-
 .../git_cl/examples/full.expected/basic.json       | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/recipes/recipe_modules/git_cl/api.py b/recipes/recipe_modules/git_cl/api.py
index 039345ebd..e9cb12dfe 100644
--- a/recipes/recipe_modules/git_cl/api.py
+++ b/recipes/recipe_modules/git_cl/api.py
@@ -16,7 +16,7 @@ class GitClApi(recipe_api.RecipeApi):
       name = name + ' (%s)' % kwargs.pop('suffix')
 
     my_loc = self.c.repo_location if self.c else None
-    cmd = ['vpython', self.repo_resource('git_cl.py'), subcmd] + args
+    cmd = ['vpython3', self.repo_resource('git_cl.py'), subcmd] + args
     with self.m.context(cwd=self.m.context.cwd or my_loc):
       return self.m.step(name, cmd, **kwargs)
 
diff --git a/recipes/recipe_modules/git_cl/examples/full.expected/basic.json b/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
index 4df201d47..e978b41a3 100644
--- a/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
+++ b/recipes/recipe_modules/git_cl/examples/full.expected/basic.json
@@ -1,7 +1,7 @@
 [
   {
     "cmd": [
-      "vpython",
+      "vpython3",
       "RECIPE_REPO[depot_tools]/git_cl.py",
       "upload",
       "--message-file",
@@ -11,7 +11,7 @@
   },
   {
     "cmd": [
-      "vpython",
+      "vpython3",
       "RECIPE_REPO[depot_tools]/git_cl.py",
       "issue"
     ],
@@ -19,7 +19,7 @@
   },
   {
     "cmd": [
-      "vpython",
+      "vpython3",
       "RECIPE_REPO[depot_tools]/git_cl.py",
       "description",
       "-d",
@@ -29,7 +29,7 @@
   },
   {
     "cmd": [
-      "vpython",
+      "vpython3",
       "RECIPE_REPO[depot_tools]/git_cl.py",
       "description",
       "-n",
@@ -48,7 +48,7 @@
   },
   {
     "cmd": [
-      "vpython",
+      "vpython3",
       "RECIPE_REPO[depot_tools]/git_cl.py",
       "description",
       "-d"
@@ -65,7 +65,7 @@
   },
   {
     "cmd": [
-      "vpython",
+      "vpython3",
       "RECIPE_REPO[depot_tools]/git_cl.py",
       "description",
       "-n",
@@ -77,7 +77,7 @@
   },
   {
     "cmd": [
-      "vpython",
+      "vpython3",
       "RECIPE_REPO[depot_tools]/git_cl.py",
       "description",
       "-d"