cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only used stripped data for testing if the file is json, but used unstripped when actually parsing. Fixes #6348

Browse source
This commit is contained in:
Matt Martz 2014-03-10 13:43:34 -05:00
parent 678fb4ffbe
commit 4b400ca5e9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/utils/__init__.py
View file

@ -354,9 +354,9 @@ def smush_ds(data):
def parse_yaml(data, path_hint=None):
''' convert a yaml string to a data structure. Also supports JSON, ssssssh!!!'''
data = data.lstrip()
stripped_data = data.lstrip()
loaded = None
if data.startswith("{") or data.startswith("["):
if stripped_data.startswith("{") or stripped_data.startswith("["):
# since the line starts with { or [ we can infer this is a JSON document.
try:
loaded = json.loads(data)