From 13928b7e7f1a37e5e70cae53aba089f88bbbccfc Mon Sep 17 00:00:00 2001
From: Edward Lesmes <ehmaldonado@chromium.org>
Date: Thu, 9 Jan 2020 22:38:48 +0000
Subject: [PATCH] Revert "vpython: Specify interpreter to run."

This reverts commit 797d74a266bb5ffaa3882dd6a19432d586be776c.

Reason for revert: Causes pylint to fail executing on "Depot Tools Presubmit (win)".

Original change's description:
> vpython: Specify interpreter to run.
>
> Specify the interpreter to run to avoid issues with several
> python installations on Windows.
>
> Bug: 1036606
>
> Change-Id: Ib70d041acc52c940711460219acd8f4ad58637a9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1992608
> Reviewed-by: Anthony Polito <apolito@google.com>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

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

Change-Id: I5902ceb9db85fdad81e781b51281fba8534a99d5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1036606
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1994114
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
---
 vpython.bat  | 2 +-
 vpython3     | 6 +++---
 vpython3.bat | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vpython.bat b/vpython.bat
index ca5fe39ba1..8aaf929751 100644
--- a/vpython.bat
+++ b/vpython.bat
@@ -4,4 +4,4 @@
 :: found in the LICENSE file.
 
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
-"%~dp0\.cipd_bin\vpython.exe" -vpython-interpreter "%~dp0\python.bat" %*
+"%~dp0\.cipd_bin\vpython.exe" %*
diff --git a/vpython3 b/vpython3
index 5b888a30fc..bc31333e1c 100755
--- a/vpython3
+++ b/vpython3
@@ -47,7 +47,7 @@ if [[ $MINGW != 0 && $DEPOT_TOOLS_BOOTSTRAP_PYTHON3 != 0 ]]; then
     bootstrap_python3
   fi
   PYTHON3_BIN_RELDIR="$base_dir/$(cat $base_dir/python3_bin_reldir.txt | xargs echo)"
-  exec "$base_dir/.cipd_bin/vpython3" -vpython-interpreter  "$PYTHON3_BIN_RELDIR/bin/python3" "$@"
-else
-	exec "$base_dir/.cipd_bin/vpython3" "$@"
+  PATH="$PYTHON3_BIN_RELDIR":"$PYTHON3_BIN_RELDIR/Scripts":"$PATH"
 fi
+
+exec "$base_dir/.cipd_bin/vpython3" "$@"
diff --git a/vpython3.bat b/vpython3.bat
index 5be8fd02be..3b65e68ee9 100644
--- a/vpython3.bat
+++ b/vpython3.bat
@@ -9,4 +9,4 @@ for /f %%i in (%~dp0python3_bin_reldir.txt) do set PYTHON3_BIN_RELDIR=%%i
 set PATH=%~dp0%PYTHON3_BIN_RELDIR%;%PATH%
 
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
-"%~dp0\.cipd_bin\vpython3.exe" -vpython-interpreter "%~dp0\python3.bat" %*
+"%~dp0\.cipd_bin\vpython3.exe" %*