External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Regress trailing comma modification and enhance error message

Browse Source
This commit is contained in:
Aaron Tan
2017-06-14 16:06:42 -04:00
parent 422950f45d
commit 96d491fdce
2 changed files with 1 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/parsers.py
View File

@@ -62,9 +62,4 @@ class JSONParser(parsers.JSONParser):
raise ParseError(_('JSON parse error - not a JSON object'))
return obj
except ValueError as exc:
try:
# PyYAML can also parse JSON-style input string, and support more flexible
# input grammar like trailing commas.
return yaml.load(data, OrderedDictLoader)
except Exception:
raise ParseError(_('JSON parse error - %s') % six.text_type(exc))
raise ParseError(_('JSON parse error - %s\nPossible cause: trailing comma.' % six.text_type(exc)))