commit 7b6847f486aef175733e2e2c1304bc7de84f3278
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Oct 31 14:25:18 2013 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Oct 31 14:25:18 2013 +0000
tree 7dc9a82788f13337347cd268dbeb41fd0d1fc749
parent b58876718d3537b33a2a0cad6e939aa29c1efa30

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

.gitignore

diff --git a/.gitignore b/.gitignore
index 7ff6072..9dd6561 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@
 
 # Ignore locations where third-party tools are placed during bootstrapping.
 /python_bin
-/python275_bin
+/python_274
 /git_bin
 /git-1.8.0_bin
 /svn_bin

PRESUBMIT.py

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index f75b8e1..a8e90f3 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -15,7 +15,7 @@
   black_list = list(input_api.DEFAULT_BLACK_LIST) + [
       r'^cpplint\.py$',
       r'^cpplint_chromium\.py$',
-      r'^python275_bin[\/\\].+',
+      r'^python_274[\/\\].+',
       r'^python_bin[\/\\].+',
       r'^site-packages-py[0-9]\.[0-9][\/\\].+',
       r'^svn_bin[\/\\].+',

git-cl

diff --git a/git-cl b/git-cl
index df4bec0..0fc4354 100755
--- a/git-cl
+++ b/git-cl
@@ -20,8 +20,8 @@
 # Uncomment this line if you never use gclient.
 # "$base_dir"/update_depot_tools
 
-if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then
-  PYTHONDONTWRITEBYTECODE=1 cmd.exe /c "$base_dir/python.bat $base_dir/git_cl.py $@"
+if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then
+  PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/git_cl.py "$@"
 else
   PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_cl.py" "$@"
 fi

git-try

diff --git a/git-try b/git-try
index f71acb4..166f669 100755
--- a/git-try
+++ b/git-try
@@ -14,8 +14,8 @@
   base_dir=$(dirname "$0")
 fi
 
-if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then
-  PYTHONDONTWRITEBYTECODE=1 cmd.exe /c "$base_dir/python.bat $base_dir/git_try.py $@"
+if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then
+  PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/git_try.py "$@"
 else
   PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/git_try.py" "$@"
 fi

pylint

diff --git a/pylint b/pylint
index b0452a1..02cd5a4 100755
--- a/pylint
+++ b/pylint
@@ -12,8 +12,8 @@
 OUTPUT="$(uname | grep 'MINGW')"
 MINGW=$?
 
-if [ -e "$base_dir/python.bat" -a $MINGW = 0 ]; then
-  PYTHONDONTWRITEBYTECODE=1 cmd.exe /c "$base_dir/python.bat $base_dir/pylint.py $@"
+if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then
+  PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/pylint.py "$@"
 else
   PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/pylint.py" "$@"
 fi