saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #42472 from rallytime/bp-42435

Browse source 
Back-port #42435 to 2017.7.1
This commit is contained in:
garethgreenaway 2017-07-24 08:11:12 -07:00 • committed by GitHub
commit 95fe2558e4
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/yamlloader.py
View file

@ -4,6 +4,7 @@ from __future__ import absolute_import
import warnings
# Import third party libs
import re
import yaml
from yaml.nodes import MappingNode, SequenceNode
from yaml.constructor import ConstructorError
@ -101,6 +102,11 @@ class SaltYamlSafeLoader(yaml.SafeLoader, object):
# an empty string. Change it to '0'.
if node.value == '':
node.value = '0'
elif node.tag == 'tag:yaml.org,2002:str':
# If any string comes in as a quoted unicode literal, eval it into
# the proper unicode string type.
if re.match(r'^u([\'"]).+\1$', node.value, flags=re.IGNORECASE):
node.value = eval(node.value, {}, {}) # pylint: disable=W0123
return super(SaltYamlSafeLoader, self).construct_scalar(node)
def flatten_mapping(self, node):