External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 05:29:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

filter Python unicode string prefix from jsonschema validation errors.

Browse Source 
see: https://github.com/ansible/ansible-tower/issues/6417
This commit is contained in:
Ryan Petrello
2017-07-31 15:20:22 -04:00
parent 9c29b0a92f
commit 63273d8ffd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/fields.py
View File

@@ -370,7 +370,7 @@ class JSONSchemaField(JSONBField):
# If an empty {} is provided, we still want to perform this schema # If an empty {} is provided, we still want to perform this schema
# validation # validation
empty_values=(None, '') empty_values = (None, '')
def get_default(self): def get_default(self):
return copy.deepcopy(super(JSONBField, self).get_default()) return copy.deepcopy(super(JSONBField, self).get_default())
@@ -385,6 +385,9 @@ class JSONSchemaField(JSONBField):
self.schema(model_instance), self.schema(model_instance),
format_checker=self.format_checker format_checker=self.format_checker
).iter_errors(value): ).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: if error.validator == 'pattern' and 'error' in error.schema:
error.message = error.schema['error'] % error.instance error.message = error.schema['error'] % error.instance
errors.append(error) errors.append(error)