From 63273d8ffd608df75443a16e1ccddb2ad28d8107 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 31 Jul 2017 15:20:22 -0400 Subject: [PATCH] filter Python unicode string prefix from jsonschema validation errors. see: https://github.com/ansible/ansible-tower/issues/6417 --- awx/main/fields.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/awx/main/fields.py b/awx/main/fields.py index 0e956f7a96..6a746518d9 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -370,7 +370,7 @@ class JSONSchemaField(JSONBField): # If an empty {} is provided, we still want to perform this schema # validation - empty_values=(None, '') + empty_values = (None, '') def get_default(self): return copy.deepcopy(super(JSONBField, self).get_default()) @@ -385,6 +385,9 @@ class JSONSchemaField(JSONBField): self.schema(model_instance), format_checker=self.format_checker ).iter_errors(value): + # strip Python unicode markers from jsonschema validation errors + error.message = re.sub(r'\bu(\'|")', r'\1', error.message) + if error.validator == 'pattern' and 'error' in error.schema: error.message = error.schema['error'] % error.instance errors.append(error)