diff options
| author | bors-servo <servo-ops@mozilla.com> | 2021-02-25 01:19:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 01:19:51 -0500 |
| commit | 60b642968b1821fdb3a793f41b2c935d0e0ca89c (patch) | |
| tree | fb9d55c3a84f0058f4bbcae84f96406067b48ff0 | |
| parent | 19d1544b66ffad08d3484d0a4770d86f48d9651e (diff) | |
| parent | dbc7919a28da153b1129e06e30a55ef89493f47e (diff) | |
| download | servo-60b642968b1821fdb3a793f41b2c935d0e0ca89c.tar.gz servo-60b642968b1821fdb3a793f41b2c935d0e0ca89c.zip | |
Auto merge of #28193 - servo:jdm-patch-46, r=jdm
Fix more python2isms
| -rw-r--r-- | etc/taskcluster/decision_task.py | 2 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 2 |
2 files changed, 2 insertions, 2 deletions
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(""" 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) |