diff options
| author | marmeladema <xademax@gmail.com> | 2019-10-20 23:08:49 +0100 |
|---|---|---|
| committer | marmeladema <xademax@gmail.com> | 2019-10-22 10:16:00 +0100 |
| commit | d8190a79331b9d90486ce6ff81fa46aeaaea26da (patch) | |
| tree | 34533028851667c08ff891e57b2680b609d92133 | |
| parent | 179caed30f717e487000b425f38fa3e03df0ba0c (diff) | |
| download | servo-d8190a79331b9d90486ce6ff81fa46aeaaea26da.tar.gz servo-d8190a79331b9d90486ce6ff81fa46aeaaea26da.zip | |
tests/wpt/update: use urllib module from six package
| -rw-r--r-- | tests/wpt/update/fetchlogs.py | 8 | ||||
| -rw-r--r-- | tests/wpt/update/github.py | 2 | ||||
| -rw-r--r-- | tests/wpt/update/upstream.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/wpt/update/fetchlogs.py b/tests/wpt/update/fetchlogs.py index c3492431f4c..385f2c54174 100644 --- a/tests/wpt/update/fetchlogs.py +++ b/tests/wpt/update/fetchlogs.py @@ -8,7 +8,7 @@ import gzip import json import os import requests -import urlparse +import six.moves.urllib as urllib treeherder_base = "https://treeherder.mozilla.org/" @@ -53,7 +53,7 @@ def download(url, prefix, dest, force_suffix=True): def get_blobber_url(branch, job): job_id = job["id"] - resp = requests.get(urlparse.urljoin(treeherder_base, + resp = requests.get(urllib.parse.urljoin(treeherder_base, "/api/project/%s/artifact/?job_id=%i&name=Job%%20Info" % (branch, job_id))) job_data = resp.json() @@ -71,13 +71,13 @@ def get_blobber_url(branch, job): def get_structured_logs(branch, commit, dest=None): - resp = requests.get(urlparse.urljoin(treeherder_base, "/api/project/%s/resultset/?revision=%s" % (branch, commit))) + resp = requests.get(urllib.parse.urljoin(treeherder_base, "/api/project/%s/resultset/?revision=%s" % (branch, commit))) revision_data = resp.json() result_set = revision_data["results"][0]["id"] - resp = requests.get(urlparse.urljoin(treeherder_base, "/api/project/%s/jobs/?result_set_id=%s&count=2000&exclusion_profile=false" % (branch, result_set))) + resp = requests.get(urllib.parse.urljoin(treeherder_base, "/api/project/%s/jobs/?result_set_id=%s&count=2000&exclusion_profile=false" % (branch, result_set))) job_data = resp.json() diff --git a/tests/wpt/update/github.py b/tests/wpt/update/github.py index 440e00df028..8cd03d9d9f6 100644 --- a/tests/wpt/update/github.py +++ b/tests/wpt/update/github.py @@ -5,7 +5,7 @@ from __future__ import print_function import json -from urlparse import urljoin +from six.moves.urllib.parse import urljoin requests = None class GitHubError(Exception): diff --git a/tests/wpt/update/upstream.py b/tests/wpt/update/upstream.py index 1fa9e59440e..9d565d5f4a9 100644 --- a/tests/wpt/update/upstream.py +++ b/tests/wpt/update/upstream.py @@ -4,7 +4,7 @@ import os import re import subprocess import sys -import urlparse +import six.moves.urllib as urllib from wptrunner.update.sync import UpdateCheckout from wptrunner.update.tree import get_unique_name @@ -264,7 +264,7 @@ class MergeUpstream(Step): if "merge_index" not in state: state.merge_index = 0 - org, name = urlparse.urlsplit(state.sync["remote_url"]).path[1:].split("/") + org, name = urllib.parse.urlsplit(state.sync["remote_url"]).path[1:].split("/") if name.endswith(".git"): name = name[:-4] state.gh_repo = gh.repo(org, name) |