diff --git a/fetch b/fetch index 4f0065b3d0..439fe77117 100755 --- a/fetch +++ b/fetch @@ -9,13 +9,4 @@ base_dir=$(dirname "$0") # standalone, but allow other PATH manipulations to take priority. PATH=$PATH:$base_dir -if [[ $GCLIENT_PY3 == 1 ]]; then - # Explicitly run on Python 3 - PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/fetch.py" "$@" -elif [[ $GCLIENT_PY3 == 0 ]]; then - # Explicitly run on Python 2 - PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/fetch.py" "$@" -else - # Run on Python 3, allows default to be flipped. - PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/fetch.py" "$@" -fi +PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/fetch.py" "$@" diff --git a/fetch.bat b/fetch.bat index 26d8bc130d..3eb7845354 100755 --- a/fetch.bat +++ b/fetch.bat @@ -16,13 +16,4 @@ IF %ERRORLEVEL% NEQ 0 ( set PATH=%PATH%;%~dp0 :: Defer control. -IF "%GCLIENT_PY3%" == "1" ( - :: Explicitly run on Python 3 - call vpython3 "%~dp0\fetch.py" %* -) ELSE IF "%GCLIENT_PY3%" == "0" ( - :: Explicitly run on Python 2 - call vpython "%~dp0\fetch.py" %* -) ELSE ( - :: Run on Python 3, allows default to be flipped. - call vpython3 "%~dp0\fetch.py" %* -) +call vpython3 "%~dp0\fetch.py" %* diff --git a/gclient b/gclient index 4ef5ab03b3..cd77c77d60 100755 --- a/gclient +++ b/gclient @@ -26,13 +26,4 @@ fi # standalone, but allow other PATH manipulations to take priority. PATH=$PATH:$base_dir -if [[ $GCLIENT_PY3 == 1 ]]; then - # Explicitly run on Python 3 - PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@" -elif [[ $GCLIENT_PY3 == 0 ]]; then - # Explicitly run on Python 2 - PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/gclient.py" "$@" -else - # Run on Python 3, allows default to be flipped. - PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@" -fi +PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@" diff --git a/gclient.bat b/gclient.bat index 5a6ca1938c..d88a3186e2 100755 --- a/gclient.bat +++ b/gclient.bat @@ -20,13 +20,4 @@ IF %ERRORLEVEL% NEQ 0 ( set PATH=%PATH%;%~dp0 :: Defer control. -IF "%GCLIENT_PY3%" == "1" ( - :: Explicitly run on Python 3 - call vpython3 "%~dp0gclient.py" %* -) ELSE IF "%GCLIENT_PY3%" == "0" ( - :: Explicitly run on Python 2 - call vpython "%~dp0gclient.py" %* -) ELSE ( - :: Run on Python 3, allows default to be flipped. - call vpython3 "%~dp0gclient.py" %* -) +call vpython3 "%~dp0gclient.py" %* diff --git a/python_runner.sh b/python_runner.sh index 0e4a3dca6d..cf48c9a930 100755 --- a/python_runner.sh +++ b/python_runner.sh @@ -48,13 +48,4 @@ SCRIPT="${SCRIPT-${BASENAME//-/_}.py}" # standalone, but allow other PATH manipulations to take priority. PATH=$PATH:$DEPOT_TOOLS -if [[ $GCLIENT_PY3 = 1 ]]; then - # Explicitly run on Python 3 - vpython3 "$DEPOT_TOOLS/$SCRIPT" "$@" -elif [[ $GCLIENT_PY3 = 0 ]]; then - # Explicitly run on Python 2 - vpython "$DEPOT_TOOLS/$SCRIPT" "$@" -else - # Run on Python 3, allows default to be flipped. - vpython3 "$DEPOT_TOOLS/$SCRIPT" "$@" -fi +vpython3 "$DEPOT_TOOLS/$SCRIPT" "$@" diff --git a/roll-dep b/roll-dep index 6c0e6388c2..663231e140 100755 --- a/roll-dep +++ b/roll-dep @@ -9,13 +9,4 @@ base_dir=$(dirname "$0") # standalone, but allow other PATH manipulations to take priority. PATH=$PATH:$base_dir -if [[ $GCLIENT_PY3 = 1 ]]; then - # Explicitly run on Python 3 - PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/roll_dep.py" "$@" -elif [[ $GCLIENT_PY3 = 0 ]]; then - # Explicitly run on Python 2 - PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/roll_dep.py" "$@" -else - # Run on Python 2 for now, allows default to be flipped. - PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/roll_dep.py" "$@" -fi +PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/roll_dep.py" "$@" diff --git a/roll-dep.bat b/roll-dep.bat index 9ad5248a29..75f689eaec 100755 --- a/roll-dep.bat +++ b/roll-dep.bat @@ -9,13 +9,4 @@ setlocal set PATH=%PATH%;%~dp0 :: Defer control. -IF "%GCLIENT_PY3%" == "1" ( - :: Explicitly run on Python 3 - call vpython3 "%~dp0\roll_dep.py" %* -) ELSE IF "%GCLIENT_PY3%" == "0" ( - :: Explicitly run on Python 2 - call vpython "%~dp0\roll_dep.py" %* -) ELSE ( - :: Run on Python 3, allows default to be flipped. - call vpython3 "%~dp0\roll_dep.py" %* -) +call vpython3 "%~dp0\roll_dep.py" %*