depot_tools: Move six to depot_tools' .vpython

Bug: 984182
Change-Id: I34a242c8607624beb0f06a27c563e413dec99790
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1717492
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: Michael Moss <mmoss@chromium.org>

.gitattributes

@@ -11,6 +11,7 @@
 
 # vpython specs
 /gsutil.vpython recipes
+/.vpython       recipes
 
 # Extensionless tools we want and support scripts.
 /autoninja*                   recipes

.vpython

 python_version: "2.7"
+
 # Used by:
 #   testing_support/super_mox.py
 wheel: <
   name: "infra/python/wheels/mox-py2_py3"
   version: "version:0.5.3"
 >
+
+# Used by:
+#   gclient.py
+#   testing_support/super_mox.py
+#   upload_metrics.py
+wheel: <
+  name: "infra/python/wheels/six-py2_py3"
+  version: "version:1.12.0"
+>

cit

@@ -5,4 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/cit.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/cit.py" "$@"

cit.bat

@@ -9,4 +9,4 @@ setlocal
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-python "%~dp0\cit.py" %*
+vpython "%~dp0\cit.py" %*

cit.py

-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

fetch

@@ -5,4 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/fetch.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/fetch.py" "$@"

fetch.bat

@@ -12,4 +12,4 @@ call "%~dp0\update_depot_tools.bat"
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-python "%~dp0\fetch.py" %*
+vpython "%~dp0\fetch.py" %*

fetch.py

-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

gclient

@@ -19,4 +19,4 @@ if [[ "#grep#fetch#cleanup#diff#setdep#" != *"#$1#"* ]]; then
   esac
 fi
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/gclient.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/gclient.py" "$@"

gclient.bat

@@ -12,4 +12,4 @@ call "%~dp0update_depot_tools.bat" %*
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-python "%~dp0gclient.py" %*
+vpython "%~dp0gclient.py" %*

gclient.py

-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -94,6 +94,7 @@ import platform
 import posixpath
 import pprint
 import re
+import six
 import sys
 import time
 
@@ -116,7 +117,6 @@ import subcommand
 import subprocess2
 import setup_color
 
-from third_party import six
 
 
 # TODO(crbug.com/953884): Remove this when python3 migration is done.

git-runhooks

@@ -18,6 +18,6 @@ if [ "${kernel_name:0:5}" = "MINGW" ]; then
   cmd "/C ${dir}\\python.bat ${dir}\\gclient.py runhooks --spec=$gclient_spec"
 else
   dir="$(dirname $0)"
-  PYTHONDONTWRITEBYTECODE=1 exec python "$dir/gclient.py" runhooks --spec="$gclient_spec"
+  PYTHONDONTWRITEBYTECODE=1 exec vpython "$dir/gclient.py" runhooks --spec="$gclient_spec"
 fi
 exit $?

git_cl.py

-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

git_nav_downstream.py

-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

roll-dep

@@ -5,4 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/roll_dep.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/roll_dep.py" "$@"

roll-dep.bat

@@ -9,4 +9,4 @@ setlocal
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-python "%~dp0\roll_dep.py" %*
+vpython "%~dp0\roll_dep.py" %*

roll_dep.py

-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.

testing_support/super_mox.py

@@ -13,9 +13,8 @@ import string
 import subprocess
 import sys
 
-sys.path.append(os.path.dirname(os.path.dirname(__file__)))
 import mox
-from third_party.six.moves import StringIO
+from six.moves import StringIO
 
 
 class IsOneOf(mox.Comparator):

third_party/six/LICENSE.txt

-Copyright (c) 2010-2014 Benjamin Peterson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

third_party/six/README.chromium

-URL: https://pypi.python.org/pypi/six
-Version: 1.8.0
-License: MIT
-License File: LICENSE.txt
-
-Description:
-This directory contains the Python six module.
-
-Local Modifications:
-None

upload_metrics.py

-#!/usr/bin/env python
+#!/usr/bin/env vpython
 # Copyright (c) 2018 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import sys
 
-from third_party.six.moves import urllib
-from third_party.six.moves import input # pylint: disable=redefined-builtin
+from six.moves import urllib
+from six.moves import input # pylint: disable=redefined-builtin
 
 import metrics_utils