Bug 1524639: [taskgraph] Force yaml to be loaded as unicode; r=dustin

Differential Revision: https://phabricator.services.mozilla.com/D18375
This commit is contained in:
Tom Prince
2019-02-04 22:18:57 +00:00
parent bc04b4b311
commit d2877004a8
5 changed files with 32 additions and 9 deletions

View File

@@ -9,7 +9,6 @@ from __future__ import absolute_import, print_function, unicode_literals
import os.path
import json
import time
import yaml
from datetime import datetime
from mozbuild.util import ReadOnlyDict, memoize
@@ -196,6 +195,7 @@ def load_parameters_file(filename, strict=True, overrides=None):
"""
import urllib
from taskgraph.util.taskcluster import get_artifact_url, find_task_id
from taskgraph.util import yaml
if overrides is None:
overrides = {}
@@ -222,7 +222,7 @@ def load_parameters_file(filename, strict=True, overrides=None):
f = urllib.urlopen(filename)
if filename.endswith('.yml'):
kwargs = yaml.safe_load(f)
kwargs = yaml.load_stream(f)
elif filename.endswith('.json'):
kwargs = json.load(f)
else: