From b1cc5ed9e8522b3a773ae22ffdd6cbfc3d3a4ffc Mon Sep 17 00:00:00 2001
From: Dirk Pranke <dpranke@google.com>
Date: Wed, 14 Apr 2021 23:58:11 +0000
Subject: [PATCH] Revert "Switch download_from_google_storage scripts to invoke
 python3."

This reverts commit f6e3b7fb3a91133d9edcbe9782f7b377b2546a34.

Reason for revert: See https://ci.chromium.org/ui/p/chromium/builders/try/linux-rel/665976/overview - looks like the bots don't have depot_tools populated :(.

Original change's description:
> Switch download_from_google_storage scripts to invoke python3.
>
> Bug: 941669
> Change-Id: I65a9ca3453858c447f6533d9a3a4eade4a825aa7
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2825441
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>

Bug: 941669
Change-Id: I69856a8c68394ac42126ac68b38d68a6c0104872
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2827161
Auto-Submit: Dirk Pranke <dpranke@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
---
 download_from_google_storage     | 2 +-
 download_from_google_storage.bat | 2 +-
 download_from_google_storage.py  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/download_from_google_storage b/download_from_google_storage
index 181c1d97e..74e1e83f9 100755
--- a/download_from_google_storage
+++ b/download_from_google_storage
@@ -5,4 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-PYTHONDONTWRITEBYTECODE=1 exec $base_dir/python-bin/python3 "$base_dir/download_from_google_storage.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/download_from_google_storage.py" "$@"
diff --git a/download_from_google_storage.bat b/download_from_google_storage.bat
index 314c1efdc..f1f2d2161 100755
--- a/download_from_google_storage.bat
+++ b/download_from_google_storage.bat
@@ -9,4 +9,4 @@ setlocal
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-%dp0\python-bin\python3.bat "%~dp0\download_from_google_storage.py" %*
+python "%~dp0\download_from_google_storage.py" %*
diff --git a/download_from_google_storage.py b/download_from_google_storage.py
index 632b661d2..50b34b8f5 100755
--- a/download_from_google_storage.py
+++ b/download_from_google_storage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # 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.