Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove incorrect usage of UnsafeProxy #59633

Merged
merged 1 commit into from
Jul 29, 2019
Merged

Remove incorrect usage of UnsafeProxy #59633

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/ansible/executor/task_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from ansible.template import Templar
from ansible.utils.collection_loader import AnsibleCollectionLoader
from ansible.utils.listify import listify_lookup_plugin_terms
from ansible.utils.unsafe_proxy import UnsafeProxy, wrap_var
from ansible.utils.unsafe_proxy import UnsafeProxy, wrap_var, AnsibleUnsafe
from ansible.vars.clean import namespace_facts, clean_facts
from ansible.utils.display import Display
from ansible.utils.vars import combine_vars, isidentifier
Expand Down Expand Up @@ -151,9 +151,7 @@ def run(self):
res['changed'] = False

def _clean_res(res, errors='surrogate_or_strict'):
if isinstance(res, UnsafeProxy):
return res._obj
elif isinstance(res, binary_type):
if isinstance(res, binary_type):
return to_text(res, errors=errors)
elif isinstance(res, dict):
for k in res:
Expand Down Expand Up @@ -268,7 +266,7 @@ def _get_loop_items(self):

if items:
for idx, item in enumerate(items):
if item is not None and not isinstance(item, UnsafeProxy):
if item is not None and not isinstance(item, AnsibleUnsafe):
items[idx] = UnsafeProxy(item)

return items
Expand Down