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
mitogen-hq · May 30, 2019 · d71d0ea · d71d0ea
2 parents 6f4cbc1 + 1a92995
commit d71d0ea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml
@@ -88,8 +88,14 @@ jobs:
         #DISTROS: debian
         #STRATEGY: linear
 
-      Vanilla_280_27:
+      Ansible_280_27:
         python.version: '2.7'
         MODE: ansible
         VER: 2.8.0
         DISTROS: debian
+
+      Ansible_280_35:
+        python.version: '3.5'
+        MODE: ansible
+        VER: 2.8.0
+        DISTROS: debian
diff --git a/ansible_mitogen/runner.py b/ansible_mitogen/runner.py
@@ -760,7 +760,12 @@ def _setup_imports(self):
         for fullname, _, _ in self.module_map['custom']:
             mitogen.core.import_module(fullname)
         for fullname in self.module_map['builtin']:
-            mitogen.core.import_module(fullname)
+            try:
+                mitogen.core.import_module(fullname)
+            except ImportError:
+                # TODO: this is a huge hack to work around issue #590.
+                if fullname != 'ansible.module_utils.distro._distro':
+                    raise
 
     def _setup_excepthook(self):
         """