From ea1b5204eaab2984f729cd1b10a1a676e5cc22ae Mon Sep 17 00:00:00 2001
From: Lidi Zheng <lidiz@google.com>
Date: Mon, 9 Dec 2019 10:26:28 -0800
Subject: [PATCH 1/4] Make gen_build_yaml py23 agnostic

---
 test/core/end2end/gen_build_yaml.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/core/end2end/gen_build_yaml.py b/test/core/end2end/gen_build_yaml.py
index b11335e2f08..26d7a8ec79d 100755
--- a/test/core/end2end/gen_build_yaml.py
+++ b/test/core/end2end/gen_build_yaml.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python
 # Copyright 2015 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,7 @@
 
 """Generates the appropriate build.json data for all the end2end tests."""
 
+from __future__ import print_function
 
 import yaml
 import collections
@@ -405,7 +406,7 @@ def main():
           for t in END2END_TESTS.keys()
       )
   }
-  print yaml.dump(json)
+  print(yaml.dump(json))
 
 
 if __name__ == '__main__':

From 8b58d793250f63de5854f2deecdb3e1dbe40068c Mon Sep 17 00:00:00 2001
From: Lidi Zheng <lidiz@google.com>
Date: Mon, 9 Dec 2019 11:15:05 -0800
Subject: [PATCH 2/4] Remove the shebang

---
 test/core/end2end/gen_build_yaml.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/core/end2end/gen_build_yaml.py b/test/core/end2end/gen_build_yaml.py
index 26d7a8ec79d..01adcf389eb 100755
--- a/test/core/end2end/gen_build_yaml.py
+++ b/test/core/end2end/gen_build_yaml.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright 2015 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

From e6620062ff093ed58f08e7fb12a348377c3b6c3e Mon Sep 17 00:00:00 2001
From: Lidi Zheng <lidiz@google.com>
Date: Tue, 10 Dec 2019 13:07:10 -0800
Subject: [PATCH 3/4] Use Python to run Python script

---
 tools/buildgen/generate_projects.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/buildgen/generate_projects.sh b/tools/buildgen/generate_projects.sh
index 95969c8a340..fa0a4d82092 100755
--- a/tools/buildgen/generate_projects.sh
+++ b/tools/buildgen/generate_projects.sh
@@ -30,6 +30,6 @@ fi
 
 . tools/buildgen/generate_build_additions.sh
 
-tools/buildgen/generate_projects.py build.yaml $gen_build_files $*
+python tools/buildgen/generate_projects.py build.yaml $gen_build_files $*
 
 rm $gen_build_files

From 1b230752e4b8030d20f2b4bb59a89987c8767a24 Mon Sep 17 00:00:00 2001
From: Lidi Zheng <lidiz@google.com>
Date: Tue, 10 Dec 2019 15:25:42 -0800
Subject: [PATCH 4/4] Use Python to execute Python

---
 tools/buildgen/generate_build_additions.sh | 2 +-
 tools/buildgen/generate_projects.py        | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/buildgen/generate_build_additions.sh b/tools/buildgen/generate_build_additions.sh
index c99ad6ee552..17430501be8 100755
--- a/tools/buildgen/generate_build_additions.sh
+++ b/tools/buildgen/generate_build_additions.sh
@@ -32,6 +32,6 @@ gen_build_files=""
 for gen_build_yaml in $gen_build_yaml_dirs
 do
   output_file=`mktemp /tmp/genXXXXXX`
-  $gen_build_yaml/gen_build_yaml.py > $output_file
+  python $gen_build_yaml/gen_build_yaml.py > $output_file
   gen_build_files="$gen_build_files $output_file"
 done
diff --git a/tools/buildgen/generate_projects.py b/tools/buildgen/generate_projects.py
index 40d90953606..bbbf1271aba 100755
--- a/tools/buildgen/generate_projects.py
+++ b/tools/buildgen/generate_projects.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python2.7
-
 # Copyright 2015 gRPC authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");