diff --git a/changelogs/fragments/unsafe-set-wrap.yaml b/changelogs/fragments/unsafe-set-wrap.yaml deleted file mode 100644 index 5e3a491632b..00000000000 --- a/changelogs/fragments/unsafe-set-wrap.yaml +++ /dev/null @@ -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) diff --git a/lib/ansible/utils/unsafe_proxy.py b/lib/ansible/utils/unsafe_proxy.py index 2a180e6d4a4..a1fce63fa4a 100644 --- a/lib/ansible/utils/unsafe_proxy.py +++ b/lib/ansible/utils/unsafe_proxy.py @@ -95,17 +95,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 diff --git a/test/integration/targets/loops/tasks/main.yml b/test/integration/targets/loops/tasks/main.yml index 026d92fd022..8cdd612aaa5 100644 --- a/test/integration/targets/loops/tasks/main.yml +++ b/test/integration/targets/loops/tasks/main.yml @@ -258,13 +258,3 @@ loop: [] register: literal_empty_list failed_when: literal_empty_list 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