Handle sets differently than lists in wrap_var. Fixes #47372 (#47510)

This commit is contained in:
Matt Martz 2018-10-23 11:18:21 -05:00 committed by GitHub
commit f6ecdf0b87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions

View file

@ -95,11 +95,17 @@ def _wrap_list(v):
return v
def _wrap_set(v):
return set(item if item is None else wrap_var(item) for item in v)
def wrap_var(v):
if isinstance(v, Mapping):
v = _wrap_dict(v)
elif isinstance(v, (MutableSequence, Set)):
elif isinstance(v, MutableSequence):
v = _wrap_list(v)
elif isinstance(v, Set):
v = _wrap_set(v)
elif v is not None and not isinstance(v, AnsibleUnsafe):
v = UnsafeProxy(v)
return v