diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-28 14:21:02 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-28 14:21:02 -0700 |
| commit | 72fc1f762e5c5df563380e9ed90bfaba131e811b (patch) | |
| tree | 2420fd4938324bedc739ec4e1573a4211a12a02f /cloudinit/util.py | |
| parent | 5233b6edb70702476463b47c06cb02b3c7f74c51 (diff) | |
| parent | d285a0463b6d16487eb5859373ccfd27eaec8b90 (diff) | |
| download | vyos-cloud-init-72fc1f762e5c5df563380e9ed90bfaba131e811b.tar.gz vyos-cloud-init-72fc1f762e5c5df563380e9ed90bfaba131e811b.zip | |
Sync with head and fix conflicts.
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index 184b37a4..f5a7ac12 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -50,6 +50,7 @@ import yaml from cloudinit import importer from cloudinit import log as logging +from cloudinit import safeyaml from cloudinit import url_helper as uhelp from cloudinit.settings import (CFG_BUILTIN) @@ -642,7 +643,7 @@ def load_yaml(blob, default=None, allowed=(dict,)): LOG.debug(("Attempting to load yaml from string " "of length %s with allowed root types %s"), len(blob), allowed) - converted = yaml.safe_load(blob) + converted = safeyaml.load(blob) if not isinstance(converted, allowed): # Yes this will just be caught, but thats ok for now... raise TypeError(("Yaml load allows %s root types," |