From 85ce95d0ffa71456531148fff5a87d109dfbb0cd Mon Sep 17 00:00:00 2001 From: Cruz Monrreal II Date: Tue, 10 Apr 2018 15:19:34 -0500 Subject: [PATCH] Modified error formatting to remove unicode character. jsonschema's error.message returns either u' or ' in strings depending on the python version. --- tools/config/__init__.py | 3 ++- tools/test/config/invalid_key/test_data.json | 2 +- tools/test/config/invalid_key_lib/test_data.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/config/__init__.py b/tools/config/__init__.py index 04677215ee..f2d43deb48 100644 --- a/tools/config/__init__.py +++ b/tools/config/__init__.py @@ -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 diff --git a/tools/test/config/invalid_key/test_data.json b/tools/test/config/invalid_key/test_data.json index 8c17e13f91..c86542f1aa 100644 --- a/tools/test/config/invalid_key/test_data.json +++ b/tools/test/config/invalid_key/test_data.json @@ -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)" } } diff --git a/tools/test/config/invalid_key_lib/test_data.json b/tools/test/config/invalid_key_lib/test_data.json index 8c17e13f91..c86542f1aa 100644 --- a/tools/test/config/invalid_key_lib/test_data.json +++ b/tools/test/config/invalid_key_lib/test_data.json @@ -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)" } }