ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6592 from cmonr/py3-tools-port 

Updates tools to be runnable in Python 3
pull/6538/merge
Cruz Monrreal 2018-04-17 15:55:15 -05:00 committed by GitHub
parent d680ceeba6 85ce95d0ff
commit 934101ecf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/config/__init__.py
View File

@ -393,7 +393,8 @@ class Config(object):
return self.format_validation_error(error.context[0], path)
else:
return "in {} element {}: {}".format(
path, str(".".join(str(p) for p in error.absolute_path)), error.message)
path, ".".join(p for p in error.absolute_path),
error.message.replace('u\'','\''))
def __init__(self, tgt, top_level_dirs=None, app_config=None):
"""Construct a mbed configuration

2
tools/test/config/invalid_key/test_data.json
View File

@ -1,5 +1,5 @@
{
"K64F": {
"exception_msg": "Additional properties are not allowed (u'unknown_key' was unexpected)"
"exception_msg": "Additional properties are not allowed ('unknown_key' was unexpected)"
}
}

2
tools/test/config/invalid_key_lib/test_data.json
View File

@ -1,5 +1,5 @@
{
"K64F": {
"exception_msg": "Additional properties are not allowed (u'unknown_key' was unexpected)"
"exception_msg": "Additional properties are not allowed ('unknown_key' was unexpected)"
}
}

6
tools/test_api.py
View File

@ -2113,11 +2113,13 @@ def find_tests(base_dir, target_name, toolchain_name, app_config=None):
# Also find any COMMON paths, we'll add these later once we find all the base tests
if 'COMMON' in relative_path_parts:
if relative_path_parts[0] != 'COMMON':
def predicate(base_pred, group_pred, (name, base, group, case)):
def predicate(base_pred, group_pred, name_base_group_case):
(name, base, group, case) = name_base_group_case
return base == base_pred and group == group_pred
commons.append((functools.partial(predicate, walk_base_dir, relative_path_parts[0]), d))
else:
def predicate(base_pred, (name, base, group, case)):
def predicate(base_pred, name_base_group_case):
(name, base, group, case) = name_base_group_case
return base == base_pred
commons.append((functools.partial(predicate, walk_base_dir), d))