Commit 7b6847f4 authored by maruel@chromium.org's avatar maruel@chromium.org

Revert r231888 "Fixes for python 2.7.5 support."

This broke git cl patch due to escaping. I tried removing the double quotes but
it didn't work out. Reverting in the meantime to unblock people until I figure
out a permanent way.

BUG=313552,241769
TBR=iannucci

Review URL: https://codereview.chromium.org/50293009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@232112 0039d316-1c4b-4281-b951-d872f2087c98
parent b5887671
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
# Ignore locations where third-party tools are placed during bootstrapping. # Ignore locations where third-party tools are placed during bootstrapping.
/python_bin /python_bin
/python275_bin /python_274
/git_bin /git_bin
/git-1.8.0_bin /git-1.8.0_bin
/svn_bin /svn_bin
......
...@@ -15,7 +15,7 @@ def CommonChecks(input_api, output_api, tests_to_black_list): ...@@ -15,7 +15,7 @@ def CommonChecks(input_api, output_api, tests_to_black_list):
black_list = list(input_api.DEFAULT_BLACK_LIST) + [ black_list = list(input_api.DEFAULT_BLACK_LIST) + [
r'^cpplint\.py$', r'^cpplint\.py$',
r'^cpplint_chromium\.py$', r'^cpplint_chromium\.py$',
r'^python275_bin[\/\\].+', r'^python_274[\/\\].+',
r'^python_bin[\/\\].+', r'^python_bin[\/\\].+',
r'^site-packages-py[0-9]\.[0-9][\/\\].+', r'^site-packages-py[0-9]\.[0-9][\/\\].+',
r'^svn_bin[\/\\].+', r'^svn_bin[\/\\].+',
......
...@@ -20,8 +20,8 @@ fi ...@@ -20,8 +20,8 @@ fi
# Uncomment this line if you never use gclient. # Uncomment this line if you never use gclient.
# "$base_dir"/update_depot_tools # "$base_dir"/update_depot_tools
if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then
PYTHONDONTWRITEBYTECODE=1 cmd.exe /c "$base_dir/python.bat $base_dir/git_cl.py $@" PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/git_cl.py "$@"
else else
PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_cl.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_cl.py" "$@"
fi fi
...@@ -14,8 +14,8 @@ else ...@@ -14,8 +14,8 @@ else
base_dir=$(dirname "$0") base_dir=$(dirname "$0")
fi fi
if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then
PYTHONDONTWRITEBYTECODE=1 cmd.exe /c "$base_dir/python.bat $base_dir/git_try.py $@" PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/git_try.py "$@"
else else
PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_try.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_try.py" "$@"
fi fi
...@@ -12,8 +12,8 @@ base_dir=$(dirname "$0") ...@@ -12,8 +12,8 @@ base_dir=$(dirname "$0")
OUTPUT="$(uname | grep 'MINGW')" OUTPUT="$(uname | grep 'MINGW')"
MINGW=$? MINGW=$?
if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then
PYTHONDONTWRITEBYTECODE=1 cmd.exe /c "$base_dir/python.bat $base_dir/pylint.py $@" PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/pylint.py "$@"
else else
PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/pylint.py" "$@" PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/pylint.py" "$@"
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment