diff options
Diffstat (limited to 'tests/wpt/web-platform-tests/tools/ci/tc/taskgraph.py')
-rw-r--r-- | tests/wpt/web-platform-tests/tools/ci/tc/taskgraph.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/wpt/web-platform-tests/tools/ci/tc/taskgraph.py b/tests/wpt/web-platform-tests/tools/ci/tc/taskgraph.py index 8c78f7b5dbe..d5c889d1fb9 100644 --- a/tests/wpt/web-platform-tests/tools/ci/tc/taskgraph.py +++ b/tests/wpt/web-platform-tests/tools/ci/tc/taskgraph.py @@ -4,9 +4,7 @@ import re from collections import OrderedDict from copy import deepcopy -import six import yaml -from six import iteritems here = os.path.dirname(__file__) @@ -27,7 +25,7 @@ def load_task_file(path): def update_recursive(data, update_data): - for key, value in iteritems(update_data): + for key, value in update_data.items(): if key not in data: data[key] = value else: @@ -94,13 +92,13 @@ def replace_vars(input_string, variables): def sub_variables(data, variables): - if isinstance(data, six.string_types): + if isinstance(data, str): return replace_vars(data, variables) if isinstance(data, list): return [sub_variables(item, variables) for item in data] if isinstance(data, dict): return {key: sub_variables(value, variables) - for key, value in iteritems(data)} + for key, value in data.items()} return data @@ -154,7 +152,7 @@ def load_tasks(tasks_data): raise ValueError("Got duplicate task name %s" % new_name) map_resolved_tasks[new_name] = substitute_variables(data) - for task_default_name, data in iteritems(map_resolved_tasks): + for task_default_name, data in map_resolved_tasks.items(): task = resolve_use(data, tasks_data["components"]) task = resolve_name(task, task_default_name) tasks.extend(resolve_chunks(task)) |