Bug 1507360: Fix python3.5 support in fetching hg fingerprints; r=gps
authorTom Prince <mozilla@hocat.ca>
Wed, 05 Dec 2018 16:00:20 +0000
changeset 449410 1368a1c58bb6374cdcbd7c5e2bb24c184a1586d8
parent 449409 d03d38b90f8208d03c9d0935299aeb2bc8a3b4fc
child 449411 c42984729af7fb8986e08f81ea457575b5d1669a
push id35162
push usershindli@mozilla.com
push dateWed, 05 Dec 2018 21:34:51 +0000
treeherdermozilla-central@89fd36f5fbe5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1507360
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1507360: Fix python3.5 support in fetching hg fingerprints; r=gps Differential Revision: https://phabricator.services.mozilla.com/D13810
taskcluster/scripts/run-task
--- a/taskcluster/scripts/run-task
+++ b/taskcluster/scripts/run-task
@@ -422,17 +422,17 @@ def vcs_checkout(source_repo, dest, stor
     # on the system, which is managed some other way (such as puppet)
     if fetch_hgfingerprint:
         try:
             print_line(b'vcs', b'fetching hg.mozilla.org fingerprint from %s\n' %
                        FINGERPRINT_URL.encode('utf-8'))
             res = urllib.request.urlopen(FINGERPRINT_URL, timeout=10)
             secret = res.read()
             try:
-                secret = json.loads(secret, encoding='utf-8')
+                secret = json.loads(secret.decode('utf-8'))
             except ValueError:
                 print_line(b'vcs', b'invalid JSON in hg fingerprint secret')
                 sys.exit(1)
         except (urllib.error.URLError, socket.timeout):
             print_line(b'vcs', b'Unable to retrieve current hg.mozilla.org fingerprint'
                                b'using the secret service, using fallback instead.')
             # XXX This fingerprint will not be accurate if running on an old
             #     revision after the server fingerprint has changed.