depot_tools: Include httplib2 using vpython.

Bug: 1002153
Change-Id: I940b9d834c2f76caab2bd86fc5d5d5c3b03b4b46
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1871763
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
changes/63/1871763/2
Edward Lemur 6 years ago committed by Commit Bot
parent 75c59424e3
commit 202c559cac

@ -1 +1,23 @@
python_version: "2.7" python_version: "2.7"
# Used by:
# auth.py
# gerrit_util.py
# git_cl.py
# my_activity.py
# TODO(crbug.com/1002153): Add ninjalog_uploader.py
wheel: <
name: "infra/python/wheels/httplib2-py2_py3"
version: "version:0.10.3"
>
# Used by:
# my_activity.py
wheel: <
name: "infra/python/wheels/python-dateutil-py2_py3"
version: "version:2.7.3"
>
wheel: <
name: "infra/python/wheels/six-py2_py3"
version: "version:1.10.0"
>

@ -9,14 +9,13 @@ from __future__ import print_function
import collections import collections
import datetime import datetime
import functools import functools
import httplib2
import json import json
import logging import logging
import os import os
import subprocess2 import subprocess2
from third_party import httplib2
# This is what most GAE apps require for authentication. # This is what most GAE apps require for authentication.
OAUTH_SCOPE_EMAIL = 'https://www.googleapis.com/auth/userinfo.email' OAUTH_SCOPE_EMAIL = 'https://www.googleapis.com/auth/userinfo.email'

@ -14,6 +14,7 @@ import base64
import contextlib import contextlib
import cookielib import cookielib
import httplib # Still used for its constants. import httplib # Still used for its constants.
import httplib2
import json import json
import logging import logging
import netrc import netrc
@ -35,7 +36,6 @@ import gclient_utils
import metrics import metrics
import metrics_utils import metrics_utils
import subprocess2 import subprocess2
from third_party import httplib2
LOGGER = logging.getLogger() LOGGER = logging.getLogger()
# With a starting sleep time of 1.5 seconds, 2^n exponential backoff, and seven # With a starting sleep time of 1.5 seconds, 2^n exponential backoff, and seven

@ -16,6 +16,7 @@ import collections
import datetime import datetime
import glob import glob
import httplib import httplib
import httplib2
import itertools import itertools
import json import json
import logging import logging
@ -37,7 +38,6 @@ import webbrowser
import zlib import zlib
from third_party import colorama from third_party import colorama
from third_party import httplib2
import auth import auth
import clang_format import clang_format
import dart_format import dart_format

@ -21,23 +21,13 @@ Example:
# check those details to determine if there was activity in the given period. # check those details to determine if there was activity in the given period.
# This means that query time scales mostly with (today() - begin). # This means that query time scales mostly with (today() - begin).
# [VPYTHON:BEGIN]
# wheel: <
# name: "infra/python/wheels/python-dateutil-py2_py3"
# version: "version:2.7.3"
# >
# wheel: <
# name: "infra/python/wheels/six-py2_py3"
# version: "version:1.10.0"
# >
# [VPYTHON:END]
from __future__ import print_function from __future__ import print_function
import collections import collections
import contextlib import contextlib
from datetime import datetime from datetime import datetime
from datetime import timedelta from datetime import timedelta
import httplib2
import itertools import itertools
import json import json
import logging import logging
@ -54,7 +44,6 @@ import auth
import fix_encoding import fix_encoding
import gerrit_util import gerrit_util
from third_party import httplib2
try: try:
import dateutil # pylint: disable=import-error import dateutil # pylint: disable=import-error

Loading…
Cancel
Save