cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

unsafe cleanup

Browse source
This commit is contained in:
Brian Coca 2018-11-28 14:37:03 -05:00 committed by Toshio Kuratomi
parent 031e961c58
commit 8c43ce491e
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/unsafe_cleanup.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- small code cleanup to make method signatures match their parents and nicer 'unsafe' handling.

7
lib/ansible/parsing/yaml/constructor.py
View file

@ -78,7 +78,7 @@ class AnsibleConstructor(SafeConstructor):
return mapping
def construct_yaml_str(self, node, unsafe=False):
def construct_yaml_str(self, node):
# Override the default string handling function
# to always return unicode objects
value = self.construct_scalar(node)
@ -86,9 +86,6 @@ class AnsibleConstructor(SafeConstructor):
ret.ansible_pos = self._node_position_info(node)
if unsafe:
ret = wrap_var(ret)
return ret
def construct_vault_encrypted_unicode(self, node):
@ -113,7 +110,7 @@ class AnsibleConstructor(SafeConstructor):
data.ansible_pos = self._node_position_info(node)
def construct_yaml_unsafe(self, node):
return self.construct_yaml_str(node, unsafe=True)
return wrap_var(self.construct_yaml_str(node))
def _node_position_info(self, node):
# the line number where the previous token has ended (plus empty lines)