diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-09-28 16:31:50 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-09-28 16:31:50 -0400 |
| commit | a7a9de1a079a70f5c8290ab5158661d3a33e5552 (patch) | |
| tree | 70d2de495d3bff96fb8bcbbc4dd9bf9c6cc7e799 /cloudinit/util.py | |
| parent | 92cbc3ae78b560cd6e81f2894d743b72b744eee1 (diff) | |
| download | vyos-cloud-init-a7a9de1a079a70f5c8290ab5158661d3a33e5552.tar.gz vyos-cloud-init-a7a9de1a079a70f5c8290ab5158661d3a33e5552.zip | |
add 'safeyaml' to cloudinit
In 0.7.0 we started using yaml.safe_load to load data rather than
yaml.load. Some producers (namely, ubuntu MAAS created) have produced
cloud-config data in the past that included python unicode types.
This creates a specialized safe_loader that is basically safe_load +
support for python unicode.
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 94b17dfa..46d490f7 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) @@ -612,7 +613,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," |