From 69d781151b8a374bd7bb42730dd0e5f6331604ba Mon Sep 17 00:00:00 2001
From: Edward Lesmes <ehmaldonado@chromium.org>
Date: Fri, 27 Sep 2019 19:24:23 +0000
Subject: [PATCH] Revert "Reland "depot_tools: Use vpython to execute fetch.""

This reverts commit b37784118cd49d66f3ff906926bf74a4b4319e50.

Reason for revert: <INSERT REASONING HERE>
Skia still has problems

Original change's description:
> Reland "depot_tools: Use vpython to execute fetch."
>
> This is a reland of 028367fe4a43d8e38fc34649865d65bec632925a
>
> Should work on Skia after https://skia-review.googlesource.com/c/skia/+/244116
>
> Original change's description:
> > depot_tools: Use vpython to execute fetch.
> >
> > Bug: 1002153
> > Change-Id: I11286bebc23bedada239d6ddb8ebb86207a41485
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1815707
> > Reviewed-by: Anthony Polito <apolito@google.com>
> > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> > Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
>
> Bug: 1002153
> Change-Id: Ifdde3c4a817ab6ca222c82c5448d630e85bf2a4b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1827719
> Reviewed-by: Anthony Polito <apolito@google.com>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=ehmaldonado@chromium.org,jcgregorio@chromium.org,apolito@google.com

Change-Id: I1963c5bccf36692209dfe10aa30d77650e40c6f1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1002153
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1829971
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
---
 fetch     | 6 +-----
 fetch.bat | 2 +-
 fetch.py  | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/fetch b/fetch
index 14a142791b..bea6718c77 100755
--- a/fetch
+++ b/fetch
@@ -5,8 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-# Ensure that "depot_tools" is somewhere in PATH so this tool can be used
-# standalone, but allow other PATH manipulations to take priority.
-PATH=$PATH:$base_dir
-
-PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/fetch.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/fetch.py" "$@"
diff --git a/fetch.bat b/fetch.bat
index 6afd53092c..5f8019a19d 100755
--- a/fetch.bat
+++ b/fetch.bat
@@ -12,4 +12,4 @@ call "%~dp0\update_depot_tools.bat"
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-vpython "%~dp0\fetch.py" %*
+python "%~dp0\fetch.py" %*
diff --git a/fetch.py b/fetch.py
index 72e52c7967..56abfb9a6d 100755
--- a/fetch.py
+++ b/fetch.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env vpython
+#!/usr/bin/env python
 # Copyright (c) 2013 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.