From 12265a8f7de02667caa3961b95760c0f37d743dd Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Fri, 11 Oct 2019 15:20:59 +0000 Subject: [PATCH] Revert "depot_tools: Add httplib2 to .vpython" This reverts commit e1410883a38ac3a3491ed470883ec405193442f6. Reason for revert: This appears to have broken Skia's Presubmit: https://chromium-swarm.appspot.com/task?id=47d11ff76d07a610 Original change's description: > depot_tools: Add httplib2 to .vpython > > Check that things won't break before further changes are made. > > Bug: 1002153 > Change-Id: I41866f26334bf9ec2732bc0f25007234a95130e4 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1854749 > Auto-Submit: Edward Lesmes > Commit-Queue: Andrii Shyshkalov > Reviewed-by: Andrii Shyshkalov TBR=tandrii@google.com,ehmaldonado@chromium.org,apolito@google.com Change-Id: Ie73c4172c349ea0c22cad399f4ef948b9486e028 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1002153 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1855590 Reviewed-by: Edward Lesmes Commit-Queue: Edward Lesmes --- .vpython | 5 ----- auth.py | 2 +- tests/auth_test.py | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.vpython b/.vpython index e3ec2487e..398aab95f 100644 --- a/.vpython +++ b/.vpython @@ -1,6 +1 @@ python_version: "2.7" - -wheel: < - name: "infra/python/wheels/httplib2-py2_py3" - version: "version:0.10.3" -> diff --git a/auth.py b/auth.py index fecb1452d..f717be15d 100644 --- a/auth.py +++ b/auth.py @@ -9,7 +9,6 @@ from __future__ import print_function import collections import datetime import functools -import httplib2 import json import logging import optparse @@ -21,6 +20,7 @@ import urlparse import subprocess2 +from third_party import httplib2 from third_party.oauth2client import client diff --git a/tests/auth_test.py b/tests/auth_test.py index c540ed8a1..dded7a1d0 100755 --- a/tests/auth_test.py +++ b/tests/auth_test.py @@ -7,7 +7,6 @@ import __builtin__ import datetime -import httplib2 import json import logging import os @@ -19,6 +18,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from testing_support import auto_stub +from third_party import httplib2 from third_party import mock import auth