Skip to content

Commit

Permalink
fix py3.5.1-3.5.3 setup import error for Ansible 2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
s1113950 committed Nov 21, 2020
1 parent 22cce2d commit 2510f1a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions ansible_mitogen/planner.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,14 @@ def _fix_py35(invocation, module_source):
We replace a relative import in the setup module with the actual full file path
This works in vanilla Ansible but not in Mitogen otherwise
"""
if invocation.module_name == 'setup' and \
if invocation.module_name in {'ansible.builtin.setup', 'setup'} and \
invocation.module_path not in invocation._overridden_sources:
# in-memory replacement of setup module's relative import
# would check for just python3.5 and run this then but we don't know the
# target python at this time yet
# NOTE: another ansible 2.10-specific fix: `from ..module_utils` used to be `from ...module_utils`
module_source = module_source.replace(
b"from ...module_utils.basic import AnsibleModule",
b"from ..module_utils.basic import AnsibleModule",
b"from ansible.module_utils.basic import AnsibleModule"
)
invocation._overridden_sources[invocation.module_path] = module_source
Expand Down

0 comments on commit 2510f1a

Please sign in to comment.