[stable-2.7] Revert "[stable-2.7] Handle sets differently than lists in wrap_var. Fixes #47372."
This reverts commit0e933f76ba
. The tests for this were broken on centos6 because jinja2 does not have a map filter on that platform. Tests need to be rewritten. (cherry picked from commitccabc2bff5
) Co-authored-by: Toshio Kuratomi <a.badger@gmail.com>
This commit is contained in:
parent
ab1834f035
commit
3b2a0de548
3 changed files with 1 additions and 19 deletions
|
@ -1,2 +0,0 @@
|
|||
bugfixes:
|
||||
- unsafe - Add special casing to sets, to support wrapping elements of sets correctly in Python 3 (https://github.com/ansible/ansible/issues/47372)
|
|
@ -96,17 +96,11 @@ 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):
|
||||
elif isinstance(v, (MutableSequence, Set)):
|
||||
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
|
||||
|
|
|
@ -252,13 +252,3 @@
|
|||
loop: "{{ fake_var }}"
|
||||
register: result
|
||||
failed_when: result is not skipped
|
||||
|
||||
# https://github.com/ansible/ansible/issues/47372
|
||||
- name: Loop unsafe list
|
||||
debug:
|
||||
var: item
|
||||
with_items: "{{ things|map('string')|unique }}"
|
||||
vars:
|
||||
things:
|
||||
- !unsafe foo
|
||||
- !unsafe bar
|
||||
|
|
Loading…
Reference in a new issue