diff --git a/fetch b/fetch index ca617e50c..4f0065b3d 100755 --- a/fetch +++ b/fetch @@ -15,9 +15,6 @@ if [[ $GCLIENT_PY3 == 1 ]]; then elif [[ $GCLIENT_PY3 == 0 ]]; then # Explicitly run on Python 2 PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/fetch.py" "$@" -elif [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then - # Run on Python 2 on Windows for now, allows default to be flipped. - 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" "$@" diff --git a/fetch.bat b/fetch.bat index 6a2e74d21..8a3476521 100755 --- a/fetch.bat +++ b/fetch.bat @@ -19,6 +19,6 @@ IF "%GCLIENT_PY3%" == "1" ( :: Explicitly run on Python 2 call vpython "%~dp0\fetch.py" %* ) ELSE ( - :: Run on Python 2, allows default to be flipped. - call vpython "%~dp0\fetch.py" %* + :: Run on Python 3, allows default to be flipped. + call vpython3 "%~dp0\fetch.py" %* ) diff --git a/gclient b/gclient index 003e190bb..cb1d46787 100755 --- a/gclient +++ b/gclient @@ -32,9 +32,6 @@ if [[ $GCLIENT_PY3 == 1 ]]; then elif [[ $GCLIENT_PY3 == 0 ]]; then # Explicitly run on Python 2 PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/gclient.py" "$@" -elif [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then - # Run on Python 2 on Windows for now, allows default to be flipped. - 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" "$@" diff --git a/gclient.bat b/gclient.bat index 7f72c31dc..d91adfbc0 100755 --- a/gclient.bat +++ b/gclient.bat @@ -23,6 +23,6 @@ IF "%GCLIENT_PY3%" == "1" ( :: Explicitly run on Python 2 call vpython "%~dp0gclient.py" %* ) ELSE ( - :: Run on Python 2, allows default to be flipped. - call vpython "%~dp0gclient.py" %* + :: Run on Python 3, allows default to be flipped. + call vpython3 "%~dp0gclient.py" %* ) diff --git a/python_runner.sh b/python_runner.sh index 60267281f..0e4a3dca6 100755 --- a/python_runner.sh +++ b/python_runner.sh @@ -54,9 +54,6 @@ if [[ $GCLIENT_PY3 = 1 ]]; then elif [[ $GCLIENT_PY3 = 0 ]]; then # Explicitly run on Python 2 vpython "$DEPOT_TOOLS/$SCRIPT" "$@" -elif [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then - # Run on Python 2 on Windows for now, allows default to be flipped. - vpython "$DEPOT_TOOLS/$SCRIPT" "$@" else # Run on Python 3, allows default to be flipped. vpython3 "$DEPOT_TOOLS/$SCRIPT" "$@" diff --git a/roll-dep b/roll-dep index cde993eda..6c0e6388c 100755 --- a/roll-dep +++ b/roll-dep @@ -15,9 +15,6 @@ if [[ $GCLIENT_PY3 = 1 ]]; then elif [[ $GCLIENT_PY3 = 0 ]]; then # Explicitly run on Python 2 PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/roll_dep.py" "$@" -elif [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then - # Run on Python 2 on Windows for now, allows default to be flipped. - 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" "$@" diff --git a/roll-dep.bat b/roll-dep.bat index 0295fbd13..9ad5248a2 100755 --- a/roll-dep.bat +++ b/roll-dep.bat @@ -16,6 +16,6 @@ IF "%GCLIENT_PY3%" == "1" ( :: Explicitly run on Python 2 call vpython "%~dp0\roll_dep.py" %* ) ELSE ( - :: Run on Python 2, allows default to be flipped. - call vpython "%~dp0\roll_dep.py" %* + :: Run on Python 3, allows default to be flipped. + call vpython3 "%~dp0\roll_dep.py" %* )