Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle ansible 2.3.3 remove_internal_keys

This commit is contained in:
Steven Robertson 2020-02-11 17:21:47 -08:00
parent cf1c3aac1c
commit 722cf0ea8d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible_mitogen/mixins.py
View File

@ -61,9 +61,15 @@ except ImportError:
from ansible.vars.unsafe_proxy import wrap_var from ansible.vars.unsafe_proxy import wrap_var
try: try:
# ansible 2.8 moved remove_internal_keys to the clean module
from ansible.vars.clean import remove_internal_keys from ansible.vars.clean import remove_internal_keys
except ImportError: except ImportError:
from ansible.vars.manager import remove_internal_keys try:
from ansible.vars.manager import remove_internal_keys
except ImportError:
# ansible 2.3.3 has remove_internal_keys as a protected func on the action class
# we'll fallback to calling self._remove_internal_keys in this case
remove_internal_keys = lambda a: None
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -385,7 +391,8 @@ class ActionModuleMixin(ansible.plugins.action.ActionBase):
self._remove_tmp_path(tmp) self._remove_tmp_path(tmp)
# prevents things like discovered_interpreter_* or ansible_discovered_interpreter_* from being set # prevents things like discovered_interpreter_* or ansible_discovered_interpreter_* from being set
remove_internal_keys(result) # handle ansible 2.3.3 that has remove_internal_keys in a different place
remove_internal_keys(result) or self._remove_internal_keys(result)
# taken from _execute_module of ansible 2.8.6 # taken from _execute_module of ansible 2.8.6
# propagate interpreter discovery results back to the controller # propagate interpreter discovery results back to the controller