cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

shippable: fix py3 issues with downloader (#46522)

Browse source
This commit is contained in:
Jordan Borean 2018-10-05 18:21:59 +10:00 committed by GitHub
parent 4376417743
commit 25c627d256
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/utils/shippable/tools/download.py
View file

@ -208,7 +208,7 @@ def main():
if args.job_metadata:
path = os.path.join(output_dir, '%s/job.json' % job_number)
contents = json.dumps(j, sort_keys=True, indent=4)
contents = json.dumps(j, sort_keys=True, indent=4).encode('utf-8')
if args.verbose or args.test:
print(path)
@ -219,7 +219,7 @@ def main():
if not os.path.exists(directory):
os.makedirs(directory)
with open(path, 'w') as metadata_fd:
with open(path, 'wb') as metadata_fd:
metadata_fd.write(contents)
if args.console_logs:
@ -266,10 +266,10 @@ def extract_contents(args, path, output_dir):
print(path)
if path.endswith('.json'):
contents = json.dumps(json.loads(contents), sort_keys=True, indent=4)
contents = json.dumps(json.loads(contents), sort_keys=True, indent=4).encode('utf-8')
if not os.path.exists(path):
with open(path, 'w') as output_fd:
with open(path, 'wb') as output_fd:
output_fd.write(contents)
@ -294,7 +294,7 @@ def download(args, headers, path, url, is_json=True):
path += '.error'
if is_json:
content = json.dumps(response.json(), sort_keys=True, indent=4)
content = json.dumps(response.json(), sort_keys=True, indent=4).encode(response.encoding)
else:
content = response.content
@ -303,7 +303,7 @@ def download(args, headers, path, url, is_json=True):
if not os.path.exists(directory):
os.makedirs(directory)
with open(path, 'w') as content_fd:
with open(path, 'wb') as content_fd:
content_fd.write(content)