Merge pull request #6377 from sivel/issue/6348

Don't lstrip data to be parsed by parse_yaml. Fixes #6384
pull/6378/head
Michael DeHaan 11 years ago
commit d9c22cd997

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

Loading…
Cancel
Save