valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add comment on why this yaml.load ref is safe

Browse Source
This commit is contained in:
Thomas S Hatch 2013-02-04 10:23:03 -07:00
parent a411a5b147
commit 04a4ce45a6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/utils/yaml.py
View File

@ -12,6 +12,10 @@ try:
except Exception:
pass
# This function is safe and needs to stay as yaml.load. The load function
# accepts a custom loader, and every time this function is used in Salt
# the custom loader defined below is used. This should be altered though to
# not require the custom loader to be explicitly added.
load = yaml.load # pylint: disable-msg=C0103
@ -34,8 +38,12 @@ class CustomLoader(yaml.SafeLoader):
yaml.SafeLoader.__init__(self, stream)
if dictclass is not dict:
# then assume ordred dict and use it for both !map and !omap
self.add_constructor(u'tag:yaml.org,2002:map', type(self).construct_yaml_map)
self.add_constructor(u'tag:yaml.org,2002:omap', type(self).construct_yaml_map)
self.add_constructor(
u'tag:yaml.org,2002:map',
type(self).construct_yaml_map)
self.add_constructor(
u'tag:yaml.org,2002:omap',
type(self).construct_yaml_map)
self.dictclass = dictclass
def construct_yaml_map(self, node):