diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-06-21 11:37:22 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-06-21 11:37:22 -0400 |
| commit | 74f09aacd76eb62dd18a265b097378b55ae0fb50 (patch) | |
| tree | 577890a21a3f7c9381a6e686b4fd513c01ee17df /cloudinit/__init__.py | |
| parent | 142fad2a9a9acb702793c33269e04d8d01fa00d6 (diff) | |
| download | vyos-cloud-init-74f09aacd76eb62dd18a265b097378b55ae0fb50.tar.gz vyos-cloud-init-74f09aacd76eb62dd18a265b097378b55ae0fb50.zip | |
use yaml.safe_load rather than yaml.load
LP: #1015818
Diffstat (limited to 'cloudinit/__init__.py')
| -rw-r--r-- | cloudinit/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index 85c6fd1b..6a1b46c5 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -421,7 +421,7 @@ class CloudInit: ## for now, not doing this as it seems somewhat circular ## as CloudConfig does that also, merging it with this cfg ## - # ccfg = yaml.load(self.cloud_config_str) + # ccfg = yaml.safe_load(self.cloud_config_str) # if ccfg is None: ccfg = {} # self.cfg = util.mergedict(ccfg, self.cfg) @@ -537,7 +537,7 @@ def get_base_cfg(cfg_path=None): def get_builtin_cfg(): - return(yaml.load(cfg_builtin)) + return(yaml.safe_load(cfg_builtin)) class DataSourceNotFoundException(Exception): |