Skip to content

Commit d71d0ea

Browse files
committed
Merge remote-tracking branch 'origin/azure-280-35'
* origin/azure-280-35: issue #590: include nasty workaround for sys.modules junk azure: try enabling Ansible 2.8/Py3.5 job
2 parents 6f4cbc1 + 1a92995 commit d71d0ea

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

.ci/azure-pipelines.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,14 @@ jobs:
8888
#DISTROS: debian
8989
#STRATEGY: linear
9090

91-
Vanilla_280_27:
91+
Ansible_280_27:
9292
python.version: '2.7'
9393
MODE: ansible
9494
VER: 2.8.0
9595
DISTROS: debian
96+
97+
Ansible_280_35:
98+
python.version: '3.5'
99+
MODE: ansible
100+
VER: 2.8.0
101+
DISTROS: debian

ansible_mitogen/runner.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,12 @@ def _setup_imports(self):
760760
for fullname, _, _ in self.module_map['custom']:
761761
mitogen.core.import_module(fullname)
762762
for fullname in self.module_map['builtin']:
763-
mitogen.core.import_module(fullname)
763+
try:
764+
mitogen.core.import_module(fullname)
765+
except ImportError:
766+
# TODO: this is a huge hack to work around issue #590.
767+
if fullname != 'ansible.module_utils.distro._distro':
768+
raise
764769

765770
def _setup_excepthook(self):
766771
"""

0 commit comments

Comments
 (0)