ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Ensure string types (#42362)

Browse source 
* actually enforce string types

* unquote after its text

* fixed incorrect template type

* fixing string showed error in template typing
This commit is contained in:
Brian Coca 2018-07-10 09:41:33 -04:00 committed by GitHub
parent 381263ad99
commit 4a7940c562
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/config/manager.py
View file

@ -99,7 +99,10 @@ def ensure_type(value, value_type, origin=None):
value = value.split(',')
value = [resolve_path(x, basedir=basedir) for x in value]
# defaults to string types
elif value_type in ('str', 'string'):
value = unquote(to_text(value, errors='surrogate_or_strict'))
# defaults to string type
elif isinstance(value, string_types):
value = unquote(value)

2
lib/ansible/plugins/action/template.py
View file

@ -89,7 +89,7 @@ class ActionModule(ActionBase):
for b_type in ('force', 'follow', 'trim_blocks'):
value = locals()[b_type]
value = ensure_type(value, 'string')
value = ensure_type(value, 'boolean')
if value is not None and not isinstance(value, bool):
raise AnsibleActionFail("%s is expected to be a boolean, but got %s instead" % (b_type, type(value)))
locals()[b_type] = value