Merge commit '77b7a31' into release-v0.3.31

ansible_mitogen/plugins/connection/__init__.py

@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Mitogen authors <https://github.com/mitogen-hq>
-# SPDX-License-Identifier: BSD-3-Clause
-# !mitogen: minify_safe
-
-import os
-import sys
-
-try:
-    import ansible_mitogen
-except ImportError:
-    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))

ansible_mitogen/plugins/connection/mitogen_buildah.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_doas.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_docker.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_jail.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_kubectl.py

@@ -30,8 +30,16 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
 import ansible.errors
 
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 import ansible_mitogen.loaders
 

ansible_mitogen/plugins/connection/mitogen_local.py

@@ -30,6 +30,12 @@ from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
 import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
 
 import ansible_mitogen.connection
 import ansible_mitogen.process

ansible_mitogen/plugins/connection/mitogen_lxc.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_lxd.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_machinectl.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_podman.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_setns.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_ssh.py

@@ -29,6 +29,9 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
 from ansible.plugins.connection.ssh import (
     DOCUMENTATION as _ansible_ssh_DOCUMENTATION,
 )
@@ -44,6 +47,10 @@ DOCUMENTATION = """
     options:
 """ + _ansible_ssh_DOCUMENTATION.partition('options:\n')[2]
 
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
 
 import ansible_mitogen.connection
 import ansible_mitogen.loaders

ansible_mitogen/plugins/connection/mitogen_su.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/connection/mitogen_sudo.py

@@ -29,6 +29,14 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
+
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.connection
 
 

ansible_mitogen/plugins/strategy/__init__.py

@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Mitogen authors <https://github.com/mitogen-hq>
-# SPDX-License-Identifier: BSD-3-Clause
-# !mitogen: minify_safe
-
-import os
-import sys
-
-try:
-    import ansible_mitogen
-except ImportError:
-    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))

ansible_mitogen/plugins/strategy/mitogen.py

@@ -29,6 +29,8 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
 
 #
 # This is not the real Strategy implementation module, it simply exists as a
@@ -45,6 +47,11 @@ __metaclass__ = type
 # debuggers and isinstance() work predictably.
 #
 
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.strategy
 import ansible.plugins.strategy.linear
 

ansible_mitogen/plugins/strategy/mitogen_free.py

@@ -29,6 +29,8 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
 
 #
 # This is not the real Strategy implementation module, it simply exists as a
@@ -45,6 +47,11 @@ __metaclass__ = type
 # debuggers and isinstance() work predictably.
 #
 
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.loaders
 import ansible_mitogen.strategy
 

ansible_mitogen/plugins/strategy/mitogen_host_pinned.py

@@ -29,6 +29,8 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
 
 #
 # This is not the real Strategy implementation module, it simply exists as a
@@ -45,6 +47,11 @@ __metaclass__ = type
 # debuggers and isinstance() work predictably.
 #
 
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.loaders
 import ansible_mitogen.strategy
 

ansible_mitogen/plugins/strategy/mitogen_linear.py

@@ -29,6 +29,8 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
+import os
+import sys
 
 #
 # This is not the real Strategy implementation module, it simply exists as a
@@ -45,6 +47,11 @@ __metaclass__ = type
 # debuggers and isinstance() work predictably.
 #
 
+try:
+    import ansible_mitogen
+except ImportError:
+    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
 import ansible_mitogen.loaders
 import ansible_mitogen.strategy
 

docs/changelog.rst

@@ -18,6 +18,13 @@ To avail of fixes in an unreleased version, please download a ZIP file
 `directly from GitHub <https://github.com/mitogen-hq/mitogen/>`_.
 
 
+v0.3.31 (2025-11-05)
+--------------------
+
+* :gh:issue:`1350` :mod:`ansible_mitogen`: Fix regression when loading plugins
+  from ``/custom/path/to/mitogen``
+
+
 v0.3.30 (2025-10-30)
 --------------------
 

mitogen/__init__.py

@@ -35,7 +35,7 @@ be expected. On the slave, it is built dynamically during startup.
 
 
 #: Library version as a tuple.
-__version__ = (0, 3, 30)
+__version__ = (0, 3, 31)
 
 
 #: This is :data:`False` in slave contexts. Previously it was used to prevent