summaryrefslogtreecommitdiff
path: root/lib/ansible/executor
diff options
context:
space:
mode:
authorMartin Krizek <martin.krizek@gmail.com>2019-07-29 09:48:09 +0200
committerGitHub <noreply@github.com>2019-07-29 09:48:09 +0200
commit08d7905be2a45e51ceed315974e25d1008bf4263 (patch)
tree032486e2e53005670b3836060b0bc7a9b3acc6b9 /lib/ansible/executor
parent6aaf0ea3825b1f86bb82f4157c0a59a6c3ab37ee (diff)
downloadansible-08d7905be2a45e51ceed315974e25d1008bf4263.tar.gz
Remove incorrect usage of UnsafeProxy (#59633)
This removes couple of uses of UnsafeProxy that relies on the implementation that is no longer present in the codebase.
Diffstat (limited to 'lib/ansible/executor')
-rw-r--r--lib/ansible/executor/task_executor.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
index 5782c93c83..f453ddb819 100644
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@@ -28,7 +28,7 @@ from ansible.plugins.loader import become_loader, cliconf_loader, connection_loa
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
@@ -151,9 +151,7 @@ class TaskExecutor:
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:
@@ -268,7 +266,7 @@ class TaskExecutor:
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