ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 11:21:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix circular import with unsafe_proxy, template, and vars

Browse source 
template/__init__.py imported unsafe_proxy from vars which caused
vars/__init__.py to load.  vars/__init__.py needed template/__init__.py
which caused issues.  Loading unsafe_proxy from another location fixes
that.
This commit is contained in:
Toshio Kuratomi 2017-04-26 15:09:36 -07:00
parent 914f8e4596
commit 1c05ed7951
12 changed files with 157 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/executor/task_executor.py
View file

@ -36,7 +36,7 @@ from ansible.template import Templar
from ansible.utils.encrypt import key_for_hostname
from ansible.utils.listify import listify_lookup_plugin_terms
from ansible.utils.ssh_functions import check_for_controlpersist
from ansible.vars.unsafe_proxy import UnsafeProxy, wrap_var
from ansible.utils.unsafe_proxy import UnsafeProxy, wrap_var
try:
from __main__ import display
@ -229,7 +229,6 @@ class TaskExecutor:
del self._job_vars[k]
if items:
from ansible.vars.unsafe_proxy import UnsafeProxy
for idx, item in enumerate(items):
if item is not None and not isinstance(item, UnsafeProxy):
items[idx] = UnsafeProxy(item)