Merge pull request #6638 from brave/httplib2

Fix 6434: Using vpython for lint

lib/util.js

@@ -453,7 +453,7 @@ const util = {
     }
     let cmd_options = config.defaultOptions
     cmd_options.cwd = config.projects['brave-core'].dir
-    util.run('python', [path.join(config.rootDir, 'scripts', 'lint.py'),
+    util.run('vpython', [path.join(config.rootDir, 'scripts', 'lint.py'),
         '--project_root=' + config.srcDir,
         '--base_branch=' + options.base], cmd_options)
   },

scripts/.vpython

@@ -0,0 +1,15 @@
+python_version: "2.7"
+
+# Used by:
+#   auth.py
+#   git_cl.py
+wheel: <
+  name: "infra/python/wheels/httplib2-py2_py3"
+  version: "version:0.10.3"
+>
+# Used by:
+#   git_cl.py
+wheel: <
+  name: "infra/python/wheels/six-py2_py3"
+  version: "version:1.10.0"
+>

scripts/lint.py

@@ -1,9 +1,10 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython
+# Copyright (c) 2019 The Brave Authors. All rights reserved.
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#!/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.