From 04b89d1b53a9dce23fd9adab686f880906bcbdc3 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 24 Feb 2021 23:03:27 -0500 Subject: [PATCH 1/2] Fix doc build under py3. --- etc/taskcluster/decision_task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index a05824cb178..51a725976e8 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -241,7 +241,7 @@ def upload_docs(): import urllib, json, os root_url = os.environ["TASKCLUSTER_PROXY_URL"] url = root_url + "/api/secrets/v1/secret/project/servo/doc.servo.org" - token = json.load(urlopen(url))["secret"]["token"] + token = json.load(urllib.request.urlopen(url))["secret"]["token"] open("/root/.git-credentials", "w").write("https://git:%s@github.com/" % token) """) .with_script(""" From dbc7919a28da153b1129e06e30a55ef89493f47e Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 24 Feb 2021 23:08:05 -0500 Subject: [PATCH 2/2] Fix encoding call. --- python/servo/package_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 2948d6c2409..40347661761 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -644,7 +644,7 @@ class PackageCommands(CommandBase): break sha256_digest.update(data) package_hash = sha256_digest.hexdigest() - package_hash_fileobj = io.BytesIO(package_hash).encode('utf-8') + package_hash_fileobj = io.BytesIO(package_hash.encode('utf-8')) latest_hash_upload_key = '{}/servo-latest.{}.sha256'.format(nightly_dir, extension) s3.upload_file(package, BUCKET, package_upload_key)