Merge pull request #1321 from moreati/release-v0.3.26

Release v0.3.26

.ci/bash_functions

@@ -1,13 +0,0 @@
-# shellcheck shell=bash
-
-# Tox environment name -> Python executable name (e.g. py312-m_mtg -> python3.12)
-toxenv-python() {
-    local pattern='^py([23])([0-9]{1,2}).*'
-    if [[ $1 =~ $pattern ]]; then
-        echo "python${BASH_REMATCH[1]}.${BASH_REMATCH[2]}"
-        return
-    else
-        echo "${FUNCNAME[0]}: $1: environment name not recognised" >&2
-        return 1
-    fi
-}

.ci/ci_lib.py

@@ -34,15 +34,13 @@ ANSIBLE_TESTS_HOSTS_DIR = os.path.join(GIT_ROOT, 'tests/ansible/hosts')
 ANSIBLE_TESTS_TEMPLATES_DIR = os.path.join(GIT_ROOT, 'tests/ansible/templates')
 DISTRO_SPECS = os.environ.get(
     'MITOGEN_TEST_DISTRO_SPECS',
-    'alma9-py3 centos5 centos8-py3 debian9 debian12-py3 ubuntu1604 ubuntu2404-py3',
+    'centos6 centos8 debian9 debian11 ubuntu1604 ubuntu2004',
 )
 IMAGE_PREP_DIR = os.path.join(GIT_ROOT, 'tests/image_prep')
 IMAGE_TEMPLATE = os.environ.get(
     'MITOGEN_TEST_IMAGE_TEMPLATE',
-    'ghcr.io/mitogen-hq/%(distro)s-test:2025.02',
+    'ghcr.io/mitogen-hq/%(distro)s-test:2021',
 )
-SUDOERS_DEFAULTS_SRC = './tests/image_prep/files/sudoers_defaults'
-SUDOERS_DEFAULTS_DEST = '/etc/sudoers.d/mitogen_test_defaults'
 TESTS_SSH_PRIVATE_KEY_FILE = os.path.join(GIT_ROOT, 'tests/data/docker/mitogen__has_sudo_pubkey.key')
 
 
@@ -60,7 +58,6 @@ def _have_cmd(args):
     try:
         subprocess.run(
             args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
-            check=True,
         )
     except OSError as exc:
         if exc.errno == errno.ENOENT:
@@ -156,15 +153,7 @@ def run_batches(batches):
         subprocess.Popen(combine(batch), shell=True)
         for batch in batches
     ]
-    for proc in procs:
+    assert [proc.wait() for proc in procs] == [0] * len(procs)
-        proc.wait()
-        if proc.returncode:
-            print(
-                'proc: pid=%i rc=%i args=%r'
-                % (proc.pid, proc.returncode, proc.args),
-                file=sys.stderr, flush=True,
-            )
-    assert [proc.returncode for proc in procs] == [0] * len(procs)
 
 
 def get_output(s, *args, **kwargs):
@@ -239,7 +228,7 @@ def container_specs(
     [{'distro': 'debian11',
       'family': 'debian',
       'hostname': 'localhost',
-      'image': 'ghcr.io/mitogen-hq/debian11-test:2025.02',
+      'image': 'ghcr.io/mitogen-hq/debian11-test:2021',
       'index': 1,
       'name': 'target-debian11-1',
       'port': 2201,
@@ -247,7 +236,7 @@ def container_specs(
      {'distro': 'centos6',
       'family': 'centos',
       'hostname': 'localhost',
-      'image': 'ghcr.io/mitogen-hq/centos6-test:2025.02',
+      'image': 'ghcr.io/mitogen-hq/centos6-test:2021',
       'index': 2,
       'name': 'target-centos6-2',
       'port': 2202,

.ci/mitogen_tests.py

@@ -2,7 +2,6 @@
 # Run the Mitogen tests.
 
 import os
-import subprocess
 
 import ci_lib
 
@@ -14,14 +13,6 @@ os.environ.update({
 if not ci_lib.have_docker():
     os.environ['SKIP_DOCKER_TESTS'] = '1'
 
-subprocess.check_call(
-    "umask 0022; sudo cp '%s' '%s'"
-    % (ci_lib.SUDOERS_DEFAULTS_SRC, ci_lib.SUDOERS_DEFAULTS_DEST),
-    shell=True,
-)
-subprocess.check_call(['sudo', 'visudo', '-cf', ci_lib.SUDOERS_DEFAULTS_DEST])
-subprocess.check_call(['sudo', '-l'])
-
 interesting = ci_lib.get_interesting_procs()
 ci_lib.run('./run_tests -v')
 ci_lib.check_stray_processes(interesting)

.ci/show_python_versions

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-set -o errexit -o nounset -o pipefail
-
-INDENT="    "
-POSSIBLE_PYTHONS=(
-    python
-    python2
-    python3
-    /usr/bin/python
-    /usr/bin/python2
-    /usr/bin/python3
-    # GitHub macOS 12 images: python2.7 is installed, but not on $PATH
-    /Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7
-)
-
-for p in "${POSSIBLE_PYTHONS[@]}"; do
-    echo "$p"
-    if [[ ${p:0:1} == "/" && -e $p ]]; then
-        :
-    elif type "$p" > /dev/null 2>&1; then
-        type "$p" 2>&1 | sed -e "s/^/${INDENT}type: /"
-    else
-        echo "${INDENT}Not present"
-        echo
-        continue
-    fi
-
-    $p -c "import sys;          print('${INDENT}version:        %d.%d.%d' % sys.version_info[:3])"
-    # macOS builders lack a realpath command
-    $p -c "import os.path;      print('${INDENT}realpath:       %s' % os.path.realpath('$(type -p "$p")'))"
-    $p -c "import sys;          print('${INDENT}sys.executable: %s' % sys.executable)"
-    echo
-done

.github/ISSUE_TEMPLATE/bug-0.2.md

@@ -0,0 +1,33 @@
+---
+name: Mitogen 0.2.x bug report
+about: Report a bug in Mitogen 0.2.x (for Ansible 2.5, 2.6, 2.7, 2.8, or 2.9)
+title: ''
+labels: affects-0.2, bug
+assignees: ''
+
+---
+
+Please drag-drop large logs as text file attachments.
+
+Feel free to write an issue in your preferred format, however if in doubt, use
+the following checklist as a guide for what to include.
+
+* Which version of Ansible are you running?
+* Is your version of Ansible patched in any way?
+* Are you running with any custom modules, or `module_utils` loaded?
+
+* Have you tried the latest master version from Git?
+* Do you have some idea of what the underlying problem may be?
+  https://mitogen.networkgenomics.com/ansible_detailed.html#common-problems has
+  instructions to help figure out the likely cause and how to gather relevant
+  logs.
+* Mention your host and target OS and versions
+* Mention your host and target Python versions
+* If reporting a performance issue, mention the number of targets and a rough
+  description of your workload (lots of copies, lots of tiny file edits, etc.)
+* If reporting a crash or hang in Ansible, please rerun with -vvv and include
+  200 lines of output around the point of the error, along with a full copy of
+  any traceback or error text in the log. Beware "-vvv" may include secret
+  data! Edit as necessary before posting.
+* If reporting any kind of problem with Ansible, please include the Ansible
+  version along with output of "ansible-config dump --only-changed".

.github/ISSUE_TEMPLATE/bug-0.3.md

@@ -0,0 +1,33 @@
+---
+name: Mitogen 0.3.x bug report
+about: Report a bug in Mitogen 0.3.x (for Ansible 2.10.x)
+title: ''
+labels: affects-0.3, bug
+assignees: ''
+
+---
+
+Please drag-drop large logs as text file attachments.
+
+Feel free to write an issue in your preferred format, however if in doubt, use
+the following checklist as a guide for what to include.
+
+* Which version of Ansible are you running?
+* Is your version of Ansible patched in any way?
+* Are you running with any custom modules, or `module_utils` loaded?
+
+* Have you tried the latest master version from Git?
+* Do you have some idea of what the underlying problem may be?
+  https://mitogen.networkgenomics.com/ansible_detailed.html#common-problems has
+  instructions to help figure out the likely cause and how to gather relevant
+  logs.
+* Mention your host and target OS and versions
+* Mention your host and target Python versions
+* If reporting a performance issue, mention the number of targets and a rough
+  description of your workload (lots of copies, lots of tiny file edits, etc.)
+* If reporting a crash or hang in Ansible, please rerun with -vvv and include
+  200 lines of output around the point of the error, along with a full copy of
+  any traceback or error text in the log. Beware "-vvv" may include secret
+  data! Edit as necessary before posting.
+* If reporting any kind of problem with Ansible, please include the Ansible
+  version along with output of "ansible-config dump --only-changed".

.github/ISSUE_TEMPLATE/bug-0.3.yml

@@ -1,62 +0,0 @@
-name: Bug report
-description: Report a bug in Mitogen 0.3.x (for Ansible 2.10 and above)
-labels:
-  - affects-0.3
-type: bug
-
-body:
-  - type: textarea
-    attributes:
-      label: Description
-      description: >
-        When does the problem occur?
-        What happens after?
-        How is this different?
-        Did it previously behave as expected?
-      placeholder: |
-        When I do X, Y happens, but I was expecting Z because ...
-        Before version 1.2.3 it worked as expected.
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Mitogen version
-      placeholder: 0.3.31, 0.3.3-9+deb12u1
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Ansible version (if applicable)
-      placeholder: 2.18.11
-
-  - type: textarea
-    attributes:
-      label: OS and environment
-      description: >
-        What operating system version(s), Python version(s), etc. are you using?
-      placeholder: |
-        Controller (master): Debian 13, Python 3.14
-        Targets (slaves): Ubuntu 20.04/Python 2.7, RHEL 10, ...
-
-  - type: textarea
-    attributes:
-      label: Steps to reproduce
-      description: >
-        Instructions, code, or playbook(s) recreate the beahviour
-      value: |
-        Steps:
-        1. Set config `foo = 42` in somefile.cfg
-        2. Run the following Python or Playbook with `cmd --option bar ...`
-
-        ```
-        Code or playbook here
-        ```
-
-  - type: textarea
-    attributes:
-      label: Anything else
-      description: >
-        Include any other details you think might be relevant or helpful.
-        Examples might include logs, unusual settings, environment variables, ...

.github/workflows/tests.yml

@@ -29,10 +29,13 @@ jobs:
           - tox_env: py27-m_ans-ans4
 
           - tox_env: py36-m_ans-ans2.10
+            python_version: '3.6'
           - tox_env: py36-m_ans-ans4
+            python_version: '3.6'
 
           - tox_env: py27-m_mtg
           - tox_env: py36-m_mtg
+            python_version: '3.6'
 
     steps:
       - uses: actions/checkout@v4
@@ -41,38 +44,90 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - run: .ci/show_python_versions
+      - name: Install build deps
-      - name: Install deps
-        id: install-deps
         run: |
           set -o errexit -o nounset -o pipefail
-          source .ci/bash_functions
+
-          PYTHON="$(toxenv-python '${{ matrix.tox_env }}')"
+          PYTHON=$(python -c 'import re; print(re.sub(r"^py([23])([0-9]{1,2}).*", r"python\1.\2", "${{ matrix.tox_env }}"))')
+
+          if [[ -z $PYTHON ]]; then
+              echo 1>&2 "Python interpreter could not be determined"
+              exit 1
+          fi
 
           sudo apt-get update
 
           if [[ $PYTHON == "python2.7" ]]; then
               sudo apt install -y python2-dev sshpass virtualenv
+          elif [[ $PYTHON == "python3.6" ]]; then
+              sudo apt install -y gcc-10 make libbz2-dev liblzma-dev libreadline-dev libsqlite3-dev libssl-dev sshpass virtualenv zlib1g-dev
+              curl --fail --silent --show-error --location https://pyenv.run | bash
+              CC=gcc-10 ~/.pyenv/bin/pyenv install --force 3.6
+          else
+              echo 1>&2 "Python interpreter $PYTHON not available"
+              exit 1
+          fi
+      - name: Show Python versions
+        run: |
+          set -o errexit -o nounset -o pipefail
+
+          # macOS builders lack a realpath command
+          type python  && python  -c"import os.path;print(os.path.realpath('$(type -p python)'))" &&  python --version
+          type python2 && python2 -c"import os.path;print(os.path.realpath('$(type -p python2)'))" && python2 --version
+          type python3 && python3 -c"import os.path;print(os.path.realpath('$(type -p python3)'))" && python3 --version
+          echo
+
+          if [ -e /usr/bin/python ]; then
+              echo "/usr/bin/python:    sys.executable: $(/usr/bin/python -c 'import sys; print(sys.executable)')"
+          fi
+
+          if [ -e /usr/bin/python2 ]; then
+              echo "/usr/bin/python2:   sys.executable: $(/usr/bin/python2 -c 'import sys; print(sys.executable)')"
+          fi
+
+          if [ -e /usr/bin/python2.7 ]; then
+              echo "/usr/bin/python2.7: sys.executable: $(/usr/bin/python2.7 -c 'import sys; print(sys.executable)')"
+          fi
+      - name: Install tooling
+        run: |
+          set -o errexit -o nounset -o pipefail
+
+          # Tox environment name (e.g. py312-m_mtg) -> Python executable name (e.g. python3.12)
+          PYTHON=$(python -c 'import re; print(re.sub(r"^py([23])([0-9]{1,2}).*", r"python\1.\2", "${{ matrix.tox_env }}"))')
+
+          if [[ -z $PYTHON ]]; then
+              echo 1>&2 "Python interpreter could not be determined"
+              exit 1
+          fi
+
+          if [[ $PYTHON == "python2.7" ]]; then
               curl "https://bootstrap.pypa.io/pip/2.7/get-pip.py" --output "get-pip.py"
               "$PYTHON" get-pip.py --user --no-python-version-warning
               # Avoid Python 2.x pip masking system pip
               rm -f ~/.local/bin/{easy_install,pip,wheel}
           elif [[ $PYTHON == "python3.6" ]]; then
-              sudo apt install -y gcc-10 make libbz2-dev liblzma-dev libreadline-dev libsqlite3-dev libssl-dev sshpass virtualenv zlib1g-dev
-              curl --fail --silent --show-error --location https://pyenv.run | bash
-              CC=gcc-10 ~/.pyenv/bin/pyenv install --force 3.6
               PYTHON="$HOME/.pyenv/versions/3.6.15/bin/python3.6"
           fi
 
           "$PYTHON" -m pip install -r "tests/requirements-tox.txt"
-          echo "python=$PYTHON" >> $GITHUB_OUTPUT
       - name: Run tests
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -o errexit -o nounset -o pipefail
-          PYTHON="${{ steps.install-deps.outputs.python }}"
+
+          # Tox environment name (e.g. py312-m_mtg) -> Python executable name (e.g. python3.12)
+          PYTHON=$(python -c 'import re; print(re.sub(r"^py([23])([0-9]{1,2}).*", r"python\1.\2", "${{ matrix.tox_env }}"))')
+
+          if [[ -z $PYTHON ]]; then
+              echo 1>&2 "Python interpreter could not be determined"
+              exit 1
+          fi
+
+          if [[ $PYTHON == "python3.6" ]]; then
+              PYTHON="$HOME/.pyenv/versions/3.6.15/bin/python3.6"
+          fi
 
           "$PYTHON" -m tox -e "${{ matrix.tox_env }}"
 
@@ -100,22 +155,22 @@ jobs:
             python_version: '3.13'
           - tox_env: py313-m_ans-ans8
             python_version: '3.13'
-          - tox_env: py314-m_ans-ans9
+          - tox_env: py313-m_ans-ans9
-            python_version: '3.14'
+            python_version: '3.13'
-          - tox_env: py314-m_ans-ans10
+          - tox_env: py313-m_ans-ans10
-            python_version: '3.14'
+            python_version: '3.13'
-          - tox_env: py314-m_ans-ans11
+          - tox_env: py313-m_ans-ans11
-            python_version: '3.14'
+            python_version: '3.13'
-          - tox_env: py314-m_ans-ans12
+          - tox_env: py313-m_ans-ans12
-            python_version: '3.14'
+            python_version: '3.13'
-          - tox_env: py314-m_ans-ans13
+
-            python_version: '3.14'
+          - tox_env: py313-m_ans-ans11-s_lin
-
+            python_version: '3.13'
-          - tox_env: py314-m_ans-ans13-s_lin
+          - tox_env: py313-m_ans-ans12-s_lin
-            python_version: '3.14'
+            python_version: '3.13'
-
+
-          - tox_env: py314-m_mtg
+          - tox_env: py313-m_mtg
-            python_version: '3.14'
+            python_version: '3.13'
 
     steps:
       - uses: actions/checkout@v4
@@ -128,46 +183,81 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - run: .ci/show_python_versions
+      - name: Install build deps
-      - name: Install deps
-        id: install-deps
         run: |
           set -o errexit -o nounset -o pipefail
-          source .ci/bash_functions
-          PYTHON="$(toxenv-python '${{ matrix.tox_env }}')"
 
           sudo apt-get update
           sudo apt-get install -y sshpass virtualenv
+      - name: Show Python versions
+        run: |
+          set -o errexit -o nounset -o pipefail
+
+          # macOS builders lack a realpath command
+          type python  && python  -c"import os.path;print(os.path.realpath('$(type -p python)'))" &&  python --version
+          type python2 && python2 -c"import os.path;print(os.path.realpath('$(type -p python2)'))" && python2 --version
+          type python3 && python3 -c"import os.path;print(os.path.realpath('$(type -p python3)'))" && python3 --version
+          echo
+
+          if [ -e /usr/bin/python ]; then
+              echo "/usr/bin/python:    sys.executable: $(/usr/bin/python -c 'import sys; print(sys.executable)')"
+          fi
+
+          if [ -e /usr/bin/python2 ]; then
+              echo "/usr/bin/python2:   sys.executable: $(/usr/bin/python2 -c 'import sys; print(sys.executable)')"
+          fi
+
+          if [ -e /usr/bin/python2.7 ]; then
+              echo "/usr/bin/python2.7: sys.executable: $(/usr/bin/python2.7 -c 'import sys; print(sys.executable)')"
+          fi
+      - name: Install tooling
+        run: |
+          set -o errexit -o nounset -o pipefail
+
+          # Tox environment name (e.g. py312-m_mtg) -> Python executable name (e.g. python3.12)
+          PYTHON=$(python -c 'import re; print(re.sub(r"^py([23])([0-9]{1,2}).*", r"python\1.\2", "${{ matrix.tox_env }}"))')
+
+          if [[ -z $PYTHON ]]; then
+              echo 1>&2 "Python interpreter could not be determined"
+              exit 1
+          fi
 
           "$PYTHON" -m pip install -r "tests/requirements-tox.txt"
-          echo "python=$PYTHON" >> $GITHUB_OUTPUT
       - name: Run tests
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -o errexit -o nounset -o pipefail
-          PYTHON="${{ steps.install-deps.outputs.python }}"
+
+          # Tox environment name (e.g. py312-m_mtg) -> Python executable name (e.g. python3.12)
+          PYTHON=$(python -c 'import re; print(re.sub(r"^py([23])([0-9]{1,2}).*", r"python\1.\2", "${{ matrix.tox_env }}"))')
+
+          if [[ -z $PYTHON ]]; then
+              echo 1>&2 "Python interpreter could not be determined"
+              exit 1
+          fi
 
           "$PYTHON" -m tox -e "${{ matrix.tox_env }}"
 
   macos:
     name: macos ${{ matrix.tox_env }}
-    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
+    # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md
-    runs-on: macos-15
+    runs-on: macos-13
     timeout-minutes: 15
 
     strategy:
       fail-fast: false
       matrix:
         include:
-          - tox_env: py314-m_lcl-ans13
+          - tox_env: py313-m_lcl-ans11
-            python_version: '3.14'
+            sshpass_version: "1.10"
-          - tox_env: py314-m_lcl-ans13-s_lin
+          - tox_env: py313-m_lcl-ans11-s_lin
-            python_version: '3.14'
+            sshpass_version: "1.10"
+          - tox_env: py313-m_lcl-ans12
+          - tox_env: py313-m_lcl-ans12-s_lin
 
-          - tox_env: py314-m_mtg
+          - tox_env: py313-m_mtg
-            python_version: '3.14'
 
     steps:
       - uses: actions/checkout@v4
@@ -175,25 +265,61 @@ jobs:
         with:
           python-version: ${{ matrix.python_version }}
         if: ${{ matrix.python_version }}
-      - run: .ci/show_python_versions
+      - name: Show Python versions
+        run: |
+          set -o errexit -o nounset -o pipefail
+
+          # macOS builders lack a realpath command
+          type python  && python  -c"import os.path;print(os.path.realpath('$(type -p python)'))" &&  python --version
+          type python2 && python2 -c"import os.path;print(os.path.realpath('$(type -p python2)'))" && python2 --version
+          type python3 && python3 -c"import os.path;print(os.path.realpath('$(type -p python3)'))" && python3 --version
+          echo
+
+          if [ -e /usr/bin/python ]; then
+              echo "/usr/bin/python:    sys.executable: $(/usr/bin/python -c 'import sys; print(sys.executable)')"
+          fi
+
+          if [ -e /usr/bin/python2 ]; then
+              echo "/usr/bin/python2:   sys.executable: $(/usr/bin/python2 -c 'import sys; print(sys.executable)')"
+          fi
+
+          if [ -e /usr/bin/python2.7 ]; then
+              echo "/usr/bin/python2.7: sys.executable: $(/usr/bin/python2.7 -c 'import sys; print(sys.executable)')"
+          fi
+
+          if [ -e /Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7 ]; then
+              # GitHub macOS 12 images: python2.7 is installed, but not on $PATH
+              echo "/Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7: sys.executable: $(/Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7 -c 'import sys; print(sys.executable)')"
+          fi
       - run: .ci/install_sshpass ${{ matrix.sshpass_version }}
         if: ${{ matrix.sshpass_version }}
-      - name: Install deps
+      - name: Install tooling
-        id: install-deps
         run: |
           set -o errexit -o nounset -o pipefail
-          source .ci/bash_functions
+
-          PYTHON="$(toxenv-python '${{ matrix.tox_env }}')"
+          # Tox environment name (e.g. py312-m_mtg) -> Python executable name (e.g. python3.12)
+          PYTHON=$(python -c 'import re; print(re.sub(r"^py([23])([0-9]{1,2}).*", r"python\1.\2", "${{ matrix.tox_env }}"))')
+
+          if [[ -z $PYTHON ]]; then
+              echo 1>&2 "Python interpreter could not be determined"
+              exit 1
+          fi
 
           "$PYTHON" -m pip install -r "tests/requirements-tox.txt"
-          echo "python=$PYTHON" >> $GITHUB_OUTPUT
       - name: Run tests
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           set -o errexit -o nounset -o pipefail
-          PYTHON="${{ steps.install-deps.outputs.python }}"
+
+          # Tox environment name (e.g. py312-m_mtg) -> Python executable name (e.g. python3.12)
+          PYTHON=$(python -c 'import re; print(re.sub(r"^py([23])([0-9]{1,2}).*", r"python\1.\2", "${{ matrix.tox_env }}"))')
+
+          if [[ -z $PYTHON ]]; then
+              echo 1>&2 "Python interpreter could not be determined"
+              exit 1
+          fi
 
           "$PYTHON" -m tox -e "${{ matrix.tox_env }}"
 

.gitignore

@@ -13,7 +13,6 @@ build/
 dist/
 extra/
 tests/ansible/.*.pid
-tests/image_prep/logs
 docs/_build/
 htmlcov/
 *.egg-info

.lgtm.yml

@@ -0,0 +1,10 @@
+path_classifiers:
+  library:
+    - "mitogen/compat"
+    - "ansible_mitogen/compat"
+queries:
+  # Mitogen 2.4 compatibility trips this query everywhere, so just disable it
+  - exclude: py/unreachable-statement
+  - exclude: py/should-use-with
+  # mitogen.core.b() trips this query everywhere, so just disable it
+  - exclude: py/import-and-import-from

README.md

@@ -7,3 +7,5 @@
 <a href="https://mitogen.networkgenomics.com/">Please see the documentation</a>.
 
 ![](https://i.imgur.com/eBM6LhJ.gif)
+
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/mitogen-hq/mitogen.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/mitogen-hq/mitogen/alerts/)

ansible_mitogen/connection.py

@@ -43,11 +43,11 @@ import ansible.errors
 import ansible.plugins.connection
 
 import mitogen.core
-import mitogen.parent
-import mitogen.service
 
 import ansible_mitogen.mixins
+import ansible_mitogen.parsing
 import ansible_mitogen.process
+import ansible_mitogen.services
 import ansible_mitogen.target
 import ansible_mitogen.transport_config
 import ansible_mitogen.utils.unsafe

ansible_mitogen/loaders.py

@@ -49,6 +49,18 @@ __all__ = [
 
 
 ANSIBLE_VERSION_MIN = (2, 10)
+ANSIBLE_VERSION_MAX = (2, 19)
+
+NEW_VERSION_MSG = (
+    "Your Ansible version (%s) is too recent. The most recent version\n"
+    "supported by Mitogen for Ansible is %s.x. Please check the Mitogen\n"
+    "release notes to see if a new version is available, otherwise\n"
+    "subscribe to the corresponding GitHub issue to be notified when\n"
+    "support becomes available.\n"
+    "\n"
+    "    https://mitogen.rtfd.io/en/latest/changelog.html\n"
+    "    https://github.com/mitogen-hq/mitogen/issues/\n"
+)
 OLD_VERSION_MSG = (
     "Your version of Ansible (%s) is too old. The oldest version supported by "
     "Mitogen for Ansible is %s."
@@ -66,6 +78,11 @@ def assert_supported_release():
             OLD_VERSION_MSG % (v, ANSIBLE_VERSION_MIN)
         )
 
+    if v[:2] > ANSIBLE_VERSION_MAX:
+        raise ansible.errors.AnsibleError(
+            NEW_VERSION_MSG % (v, ANSIBLE_VERSION_MAX)
+        )
+
 
 # this is the first file our strategy plugins import, so we need to check this here
 # in prior Ansible versions, connection_loader.get_with_context didn't exist, so if a user

ansible_mitogen/logging.py

@@ -34,6 +34,7 @@ import os
 
 import ansible.utils.display
 
+import mitogen.core
 import mitogen.utils
 
 

ansible_mitogen/mixins.py

@@ -470,7 +470,18 @@ class ActionModuleMixin(ansible.plugins.action.ActionBase):
         # chicken-and-egg issue, mitogen needs a python to run low_level_execute_command
         # which is required by Ansible's discover_interpreter function
         if self._mitogen_discovering_interpreter:
-            possible_pythons = self._mitogen_interpreter_candidates
+            possible_pythons = [
+                '/usr/bin/python',
+                'python3',
+                'python3.7',
+                'python3.6',
+                'python3.5',
+                'python2.7',
+                'python2.6',
+                '/usr/libexec/platform-python',
+                '/usr/bin/python3',
+                'python'
+            ]
         else:
             # not used, just adding a filler value
             possible_pythons = ['python']
@@ -481,15 +492,12 @@ class ActionModuleMixin(ansible.plugins.action.ActionBase):
                 rc, stdout, stderr = self._connection.exec_command(
                     cmd, in_data, sudoable, mitogen_chdir=chdir,
                 )
-            except BaseException as exc:
+            # TODO: what exception is thrown?
+            except:
                 # we've reached the last python attempted and failed
                 if possible_python == possible_pythons[-1]:
                     raise
                 else:
-                    LOG.debug(
-                        '%r._low_level_execute_command: candidate=%r ignored: %s, %r',
-                        self, possible_python, type(exc), exc,
-                    )
                     continue
 
         stdout_text = to_text(stdout, errors=encoding_errors)

ansible_mitogen/module_finder.py

@@ -44,7 +44,7 @@ except ImportError:
     # Python < 3.4, PEP 302 Import Hooks
     import imp
 
-import mitogen.imports
+import mitogen.master
 
 
 LOG = logging.getLogger(__name__)
@@ -146,7 +146,7 @@ def scan_fromlist(code):
     >>> list(scan_fromlist(code))
     [(0, 'a'), (0, 'b.c'), (0, 'd.e.f'), (0, 'g.h'), (0, 'g.i')]
     """
-    for level, modname_s, fromlist in mitogen.imports.codeobj_imports(code):
+    for level, modname_s, fromlist in mitogen.master.scan_code_imports(code):
         for name in fromlist:
             yield level, str('%s.%s' % (modname_s, name))
         if not fromlist:
@@ -172,7 +172,7 @@ def walk_imports(code, prefix=None):
         prefix = ''
     pattern = re.compile(r'(^|\.)(\w+)')
     start = len(prefix)
-    for _, name, fromlist in mitogen.imports.codeobj_imports(code):
+    for _, name, fromlist in mitogen.master.scan_code_imports(code):
         if not name.startswith(prefix):
             continue
         for match in pattern.finditer(name, start):

ansible_mitogen/planner.py

@@ -50,7 +50,6 @@ import ansible.executor.module_common
 
 import mitogen.core
 import mitogen.select
-import mitogen.service
 
 import ansible_mitogen.loaders
 import ansible_mitogen.parsing
@@ -348,25 +347,6 @@ class NewStylePlanner(ScriptPlanner):
         'freeipa.ansible_freeipa.ipaautomountlocation',
         'freeipa.ansible_freeipa.ipaautomountmap',
         'freeipa.ansible_freeipa.ipacert',
-        'freeipa.ansible_freeipa.ipaclient_api',
-        'freeipa.ansible_freeipa.ipaclient_fix_ca',
-        'freeipa.ansible_freeipa.ipaclient_fstore',
-        'freeipa.ansible_freeipa.ipaclient_get_otp',
-        'freeipa.ansible_freeipa.ipaclient_ipa_conf',
-        'freeipa.ansible_freeipa.ipaclient_join',
-        'freeipa.ansible_freeipa.ipaclient_set_hostname',
-        'freeipa.ansible_freeipa.ipaclient_setup_automount',
-        'freeipa.ansible_freeipa.ipaclient_setup_certmonger',
-        'freeipa.ansible_freeipa.ipaclient_setup_firefox',
-        'freeipa.ansible_freeipa.ipaclient_setup_krb5',
-        'freeipa.ansible_freeipa.ipaclient_setup_nis',
-        'freeipa.ansible_freeipa.ipaclient_setup_nss',
-        'freeipa.ansible_freeipa.ipaclient_setup_ntp',
-        'freeipa.ansible_freeipa.ipaclient_setup_ssh',
-        'freeipa.ansible_freeipa.ipaclient_setup_sshd',
-        'freeipa.ansible_freeipa.ipaclient_temp_krb5',
-        'freeipa.ansible_freeipa.ipaclient_test',
-        'freeipa.ansible_freeipa.ipaclient_test_keytab',
         'freeipa.ansible_freeipa.ipaconfig',
         'freeipa.ansible_freeipa.ipadelegation',
         'freeipa.ansible_freeipa.ipadnsconfig',

ansible_mitogen/plugins/connection/mitogen_buildah.py

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

ansible_mitogen/plugins/connection/mitogen_doas.py

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

ansible_mitogen/plugins/connection/mitogen_docker.py

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

ansible_mitogen/plugins/connection/mitogen_jail.py

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

ansible_mitogen/plugins/connection/mitogen_kubectl.py

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

ansible_mitogen/plugins/connection/mitogen_local.py

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

ansible_mitogen/plugins/connection/mitogen_lxc.py

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

ansible_mitogen/plugins/connection/mitogen_lxd.py

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

ansible_mitogen/plugins/connection/mitogen_machinectl.py

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

ansible_mitogen/plugins/connection/mitogen_podman.py

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

ansible_mitogen/plugins/connection/mitogen_setns.py

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

ansible_mitogen/plugins/connection/mitogen_ssh.py

@@ -29,7 +29,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-import os
+import os.path
 import sys
 
 from ansible.plugins.connection.ssh import (
@@ -50,7 +50,9 @@ DOCUMENTATION = """
 try:
     import ansible_mitogen
 except ImportError:
-    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+    base_dir = os.path.dirname(__file__)
+    sys.path.insert(0, os.path.abspath(os.path.join(base_dir, '../../..')))
+    del base_dir
 
 import ansible_mitogen.connection
 import ansible_mitogen.loaders

ansible_mitogen/plugins/connection/mitogen_su.py

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

ansible_mitogen/plugins/connection/mitogen_sudo.py

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

ansible_mitogen/plugins/strategy/mitogen.py

@@ -29,7 +29,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-import os
+import os.path
 import sys
 
 #
@@ -47,10 +47,12 @@ import sys
 # debuggers and isinstance() work predictably.
 #
 
-try:
+BASE_DIR = os.path.abspath(
-    import ansible_mitogen
+    os.path.join(os.path.dirname(__file__), '../../..')
-except ImportError:
+)
-    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
+if BASE_DIR not in sys.path:
+    sys.path.insert(0, BASE_DIR)
 
 import ansible_mitogen.strategy
 import ansible.plugins.strategy.linear

ansible_mitogen/plugins/strategy/mitogen_free.py

@@ -29,7 +29,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-import os
+import os.path
 import sys
 
 #
@@ -47,10 +47,12 @@ import sys
 # debuggers and isinstance() work predictably.
 #
 
-try:
+BASE_DIR = os.path.abspath(
-    import ansible_mitogen
+    os.path.join(os.path.dirname(__file__), '../../..')
-except ImportError:
+)
-    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
+if BASE_DIR not in sys.path:
+    sys.path.insert(0, BASE_DIR)
 
 import ansible_mitogen.loaders
 import ansible_mitogen.strategy

ansible_mitogen/plugins/strategy/mitogen_host_pinned.py

@@ -29,7 +29,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-import os
+import os.path
 import sys
 
 #
@@ -47,10 +47,12 @@ import sys
 # debuggers and isinstance() work predictably.
 #
 
-try:
+BASE_DIR = os.path.abspath(
-    import ansible_mitogen
+    os.path.join(os.path.dirname(__file__), '../../..')
-except ImportError:
+)
-    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
+if BASE_DIR not in sys.path:
+    sys.path.insert(0, BASE_DIR)
 
 import ansible_mitogen.loaders
 import ansible_mitogen.strategy

ansible_mitogen/plugins/strategy/mitogen_linear.py

@@ -29,7 +29,7 @@
 from __future__ import absolute_import, division, print_function
 __metaclass__ = type
 
-import os
+import os.path
 import sys
 
 #
@@ -47,10 +47,12 @@ import sys
 # debuggers and isinstance() work predictably.
 #
 
-try:
+BASE_DIR = os.path.abspath(
-    import ansible_mitogen
+    os.path.join(os.path.dirname(__file__), '../../..')
-except ImportError:
+)
-    sys.path.insert(0, os.path.abspath(os.path.join(__file__, '../../../..')))
+
+if BASE_DIR not in sys.path:
+    sys.path.insert(0, BASE_DIR)
 
 import ansible_mitogen.loaders
 import ansible_mitogen.strategy

ansible_mitogen/strategy.py

@@ -41,7 +41,6 @@ except ImportError:
 import mitogen.core
 import ansible_mitogen.affinity
 import ansible_mitogen.loaders
-import ansible_mitogen.logging
 import ansible_mitogen.mixins
 import ansible_mitogen.process
 

ansible_mitogen/target.py

@@ -40,6 +40,7 @@ import errno
 import grp
 import json
 import logging
+import operator
 import os
 import pty
 import pwd
@@ -65,6 +66,8 @@ if not sys.modules.get(str('__main__')):
 
 import ansible.module_utils.json_utils
 
+from ansible.module_utils.six.moves import reduce
+
 import ansible_mitogen.runner
 
 
@@ -715,9 +718,7 @@ def apply_mode_spec(spec, mode):
             mask = CHMOD_MASKS[ch]
             bits = CHMOD_BITS[ch]
             cur_perm_bits = mode & mask
-            new_perm_bits = 0
+            new_perm_bits = reduce(operator.or_, (bits[p] for p in perms), 0)
-            for perm in perms:
-                new_perm_bits |= bits[perm]
             mode &= ~mask
             if op == '=':
                 mode |= new_perm_bits

ansible_mitogen/transport_config.py

@@ -73,21 +73,13 @@ import ansible.utils.unsafe_proxy
 from ansible.module_utils.six import with_metaclass
 from ansible.module_utils.parsing.convert_bool import boolean
 
-import ansible_mitogen.utils
 import mitogen.core
 
 
 LOG = logging.getLogger(__name__)
 
-if ansible_mitogen.utils.ansible_version[:2] >= (2, 19):
-    _FALLBACK_INTERPRETER = ansible.executor.interpreter_discovery._FALLBACK_INTERPRETER
-elif ansible_mitogen.utils.ansible_version[:2] >= (2, 17):
-    _FALLBACK_INTERPRETER = u'/usr/bin/python3'
-else:
-    _FALLBACK_INTERPRETER = u'/usr/bin/python'
 
-
+def run_interpreter_discovery_if_necessary(s, task_vars, action, rediscover_python):
-def run_interpreter_discovery_if_necessary(s, candidates, task_vars, action, rediscover_python):
     """
     Triggers ansible python interpreter discovery if requested.
     Caches this value the same way Ansible does it.
@@ -115,11 +107,8 @@ def run_interpreter_discovery_if_necessary(s, candidates, task_vars, action, red
             # blow away the discovered_interpreter_config cache and rediscover
             del task_vars['ansible_facts'][discovered_interpreter_config]
 
-        try:
+        if discovered_interpreter_config not in task_vars['ansible_facts']:
-            s = task_vars[u'ansible_facts'][discovered_interpreter_config]
-        except KeyError:
             action._mitogen_discovering_interpreter = True
-            action._mitogen_interpreter_candidates = candidates
             # fake pipelining so discover_interpreter can be happy
             action._connection.has_pipelining = True
             s = ansible.executor.interpreter_discovery.discover_interpreter(
@@ -132,17 +121,18 @@ def run_interpreter_discovery_if_necessary(s, candidates, task_vars, action, red
             # cache discovered interpreter
             task_vars['ansible_facts'][discovered_interpreter_config] = s
             action._connection.has_pipelining = False
+        else:
+            s = task_vars['ansible_facts'][discovered_interpreter_config]
 
         # propagate discovered interpreter as fact
         action._discovered_interpreter_key = discovered_interpreter_config
         action._discovered_interpreter = s
 
     action._mitogen_discovering_interpreter = False
-    action._mitogen_interpreter_candidates = None
     return s
 
 
-def parse_python_path(s, candidates, task_vars, action, rediscover_python):
+def parse_python_path(s, task_vars, action, rediscover_python):
     """
     Given the string set for ansible_python_interpeter, parse it using shell
     syntax and return an appropriate argument vector. If the value detected is
@@ -153,9 +143,10 @@ def parse_python_path(s, candidates, task_vars, action, rediscover_python):
         # if python_path doesn't exist, default to `auto` and attempt to discover it
         s = 'auto'
 
-    s = run_interpreter_discovery_if_necessary(s, candidates, task_vars, action, rediscover_python)
+    s = run_interpreter_discovery_if_necessary(s, task_vars, action, rediscover_python)
+    # if unable to determine python_path, fallback to '/usr/bin/python'
     if not s:
-        s = _FALLBACK_INTERPRETER
+        s = '/usr/bin/python'
 
     return ansible.utils.shlex.shlex_split(s)
 
@@ -519,9 +510,6 @@ class PlayContextSpec(Spec):
         interpreter_python = C.config.get_config_value(
             'INTERPRETER_PYTHON', variables=variables,
         )
-        interpreter_python_fallback = C.config.get_config_value(
-            'INTERPRETER_PYTHON_FALLBACK', variables=variables,
-        )
 
         if '{{' in interpreter_python or '{%' in interpreter_python:
             templar = self._connection.templar
@@ -529,7 +517,6 @@ class PlayContextSpec(Spec):
 
         return parse_python_path(
             interpreter_python,
-            candidates=interpreter_python_fallback,
             task_vars=self._task_vars,
             action=self._action,
             rediscover_python=rediscover_python)
@@ -745,12 +732,11 @@ class MitogenViaSpec(Spec):
 
     def python_path(self, rediscover_python=False):
         s = self._host_vars.get('ansible_python_interpreter')
-        interpreter_python_fallback = self._host_vars.get(
+        # #511, #536: executor/module_common.py::_get_shebang() hard-wires
-            'ansible_interpreter_python_fallback', [],
+        # "/usr/bin/python" as the default interpreter path if no other
-        )
+        # interpreter is specified.
         return parse_python_path(
             s,
-            candidates=interpreter_python_fallback,
             task_vars=self._task_vars,
             action=self._action,
             rediscover_python=rediscover_python)

docs/ansible_detailed.rst

@@ -138,15 +138,13 @@ Noteworthy Differences
   | 8               | 3.9 - 3.13      |
   +-----------------+-----------------+
   | 9               |                 |
-  +-----------------+ 3.10 - 3.14     |
+  +-----------------+ 3.10 - 3.13     |
   | 10              |                 |
   +-----------------+-----------------+
   | 11              |                 |
-  +-----------------+ 3.11 - 3.14     |
+  +-----------------+ 3.11 - 3.13+    |
   | 12              |                 |
   +-----------------+-----------------+
-  | 13              | 3.12 - 3.14     |
-  +-----------------+-----------------+
 
   Verify your installation is running one of these versions by checking
   ``ansible --version`` output.

docs/changelog.rst

@@ -18,104 +18,6 @@ To avail of fixes in an unreleased version, please download a ZIP file
 `directly from GitHub <https://github.com/mitogen-hq/mitogen/>`_.
 
 
-In progress (unreleased)
-------------------------
-
-* :gh:issue:`1237` :mod:`mitogen`: Re-declare Python 2.4 compatibility
-* :gh:issue:`1385` :mod:`ansible_mitogen`: Remove a use of
-  ``ansible.module_utils.six``
-* :gh:issue:`1354` docs: Document Ansible 13 (ansible-core 2.20) support
-* :gh:issue:`1354` :mod:`mitogen`: Clarify error message when a module
-  request would be refused by allow or deny listing
-
-
-v0.3.35 (2025-12-01)
---------------------
-
-* :gh:issue:`1132` :mod:`ansible_mitogen` During intrepreter discovery use
-  Ansible ``INTERPRETER_PYTHON_FALLBACK`` config as list of candidates
-
-
-v0.3.34 (2025-11-27)
---------------------
-
-* :gh:issue:`1118` CI: Use 2025.02 test images, keeping same OS releases
-* :gh:issue:`1358` CI: Bump deprecated macOS 13 runner to macOS 15
-* :gh:issue:`1118` CI: Add OS release coverage: AlmaLinux 9
-* :gh:issue:`1118` CI: Add OS release coverage: CentOS 5
-* :gh:issue:`1118` CI: Add OS release coverage: Debian 12
-* :gh:issue:`1118` CI: Add OS release coverage: Ubuntu 22.04, Ubuntu 24.04
-* :gh:issue:`1124` :mod:`mitogen`: Log why a module is sent or not sent by
-  :class:`mitogen.master.ModuleResponder`
-* :gh:issue:`1124` :mod:`ansible_mitogen`: Speedup startup by not sending
-  ``__main__`` as a related module
-
-
-v0.3.33 (2025-11-22)
---------------------
-
-* :gh:issue:`1354` :mod:`ansible_mitogen`: ansible_mitogen: Ansible 13
-  (ansible-core 2.20) support
-
-
-v0.3.32 (2025-11-21)
---------------------
-
-* :gh:issue:`1243` :mod:`mitogen`: Pass first stage, context name, & preamble
-  size as seperate **argv** arguments
-* :gh:issue:`1218` :mod:`ansible_mitogen`: Remove maximum Ansible version check
-* :gh:issue:`1260` CI: Remove integration of retired lgtm.com
-
-
-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)
---------------------
-
-* :gh:issue:`1266` Import cleanups
-* :gh:issue:`1266` :mod:`ansible_mitogen`: De-duplicate sys.path manipulations
-* :gh:issue:`1344` Correct SPDX license declarations
-* :gh:issue:`1344` Declare BSD-3-Clause SPDX license in package metadata
-* :gh:issue:`1344` :mod:`mitogen`: Use :py:func:`logging.makeLogRecord`
-
-
-v0.3.29 (2025-09-18)
---------------------
-
-* :gh:issue:`1287` Python 3.14 support
-* :gh:issue:`1287` tests: Bump dependencies
-
-
-v0.3.28 (2025-09-17)
---------------------
-
-* :gh:issue:`1306` :mod:`ansible_mitogen`: Fix non-blocking IO errors in
-  first stage of bootstrap
-* :gh:issue:`1306` CI: Report sudo version on Ansible targets
-* :gh:issue:`1306` CI: Move sudo test users defaults into ``/etc/sudoers.d``
-* :gh:issue:`1306` preamble_size: Fix variability of measured command size
-* :gh:issue:`1306` tests: Count bytes written in ``stdio_test.StdIOTest``
-* :gh:issue:`1306` tests: Check stdio is blocking in sudo contexts
-* :gh:issue:`1327` :mod:`ansible_mitogen`: Add FreeIPA client modules to the
-  always-fork list
-
-
-v0.3.27 (2025-08-20)
---------------------
-
-* :gh:issue:`1325` :mod:`mitogen`: Refactor
-  ``mitogen.master.scan_code_imports()`` as
-  :func:`mitogen.import.codeobj_imports` and speed-up by 1.5 - 2.5 x
-* :gh:issue:`1329` CI: Refactor and de-duplicate Github Actions workflow
-* :gh:issue:`1315` CI: macOS: Increase failed logins limit of test users
-* :gh:issue:`1325` tests: Improve ``master_test.ScanCodeImportsTest`` coverage
-
-
 v0.3.26 (2025-08-04)
 --------------------
 
@@ -448,7 +350,7 @@ v0.3.1 (unreleased)
 * :gh:issue:`878` Kubectl connector fixed with Ansible 2.10 and above
 
 
-v0.3.0 (2021-11-24)
+v0.3.0 (2021-10-28)
 -------------------
 
 This release separates itself from the v0.2.X releases. Ansible's API changed too much to support backwards compatibility so from now on, v0.2.X releases will be for Ansible < 2.10 and v0.3.X will be for Ansible 2.10+.
@@ -461,7 +363,7 @@ This release separates itself from the v0.2.X releases. Ansible's API changed to
 * :gh:issue:`847` Removed historic Continuous Integration reverse shell
 
 
-v0.2.10 (2021-11-24)
+v0.2.10 (2021-10-28)
 --------------------
 
 * :gh:issue:`597` mitogen does not support Ansible 2.8 Python interpreter detection
@@ -476,6 +378,7 @@ v0.2.10 (2021-11-24)
   :py:meth:`ansible.plugins.callback.CallbackBase.v2_runner_on_start`
 * :gh:issue:`775` Test with Python 3.9
 * :gh:issue:`775` Add msvcrt to the default module deny list
+* :gh:issue:`847` Removed historic Continuous Integration reverse shell
 
 
 v0.2.9 (2019-11-02)

docs/howitworks.rst

@@ -27,13 +27,14 @@ Python Command Line
 ###################
 
 The Python command line sent to the host is a :mod:`zlib`-compressed [#f2]_ and
-base64-encoded copy of :py:meth:`mitogen.parent.Connection._first_stage`,
+base64-encoded copy of the :py:meth:`mitogen.master.Stream._first_stage`
-which is carefully written to maximize it compatibility and minimize its size.
+function, which has been carefully optimized to reduce its size. Prior to
-A simplified illustration of the bootstrap command is
+compression and encoding, ``CONTEXT_NAME`` is replaced with the desired context
+name in the function's source code.
 
 .. code::
 
-    python -c 'exec(sys.argv[1].decode("base64").decode("zlib"))' <base64> ...
+    python -c 'exec "xxx".decode("base64").decode("zlib")'
 
 The command-line arranges for the Python interpreter to decode the base64'd
 component, decompress it and execute it as Python code. Base64 is used since
@@ -70,8 +71,8 @@ of the large base64-encoded first stage parameter, and to replace **argv[0]**
 with something descriptive.
 
 After configuring its ``stdin`` to point to the read end of the pipe, the
-fork parent re-executes Python with **argv[0]** composed of the Python
+parent half of the fork re-executes Python, with **argv[0]** taken from the
-interpreter path and a remote name supplied by the Mitogen parent.  As no
+``CONTEXT_NAME`` variable earlier substituted into its source code. As no
 arguments are provided to this new execution of Python, and since ``stdin`` is
 connected to a pipe (whose write end is connected to the first stage), the
 Python interpreter begins reading source code to execute from the pipe

docs/index.rst

@@ -332,16 +332,12 @@ a large fleet of machines, or to alert the parent of unexpected state changes.
 Compatibility
 #############
 
-``mitogen.*`` is compatible with Python 2.4 - 2.7 and 3.6 onward; making it
+Mitogen is compatible with **Python 2.4** released November 2004, making it
 suitable for managing a fleet of potentially ancient corporate hardware, such
 as Red Hat Enterprise Linux 5, released in 2007.
 
-Every combination of Python 3.x/2.x parent and child should be possible.
+Every combination of Python 3.x/2.x parent and child should be possible,
-Automated testing cannot cover every combination, automated testing tries to
+however at present only Python 2.4, 2.6, 2.7 and 3.6 are tested automatically.
-cover the extemities (e.g. Python 3.14 parent -> Python 2.4 child).
-
-``ansible_mitogen.*`` is compatible with Python 2.7 and 3.6 onward; making it
-suitable for Ansible 2.10 onward.
 
 
 Zero Dependencies

docs/svg-boxify.py

@@ -0,0 +1,13 @@
+
+# Add viewBox attr to SVGs lacking it, so IE scales properly.
+
+import lxml.etree
+import glob
+
+
+for name in glob.glob('images/*.svg') + glob.glob('images/ansible/*.svg'):
+    doc = lxml.etree.parse(open(name))
+    svg = doc.getroot()
+    if 'viewBox' not in svg.attrib:
+        svg.attrib['viewBox'] = '0 0 %(width)s %(height)s' % svg.attrib
+        open(name, 'w').write(lxml.etree.tostring(svg, xml_declaration=True, encoding='UTF-8'))

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, 36, 'dev')
+__version__ = (0, 3, 26)
 
 
 #: This is :data:`False` in slave contexts. Previously it was used to prevent
@@ -106,8 +106,7 @@ def main(log_level='INFO', profiling=_default_profiling):
     def wrapper(func):
         if func.__module__ != '__main__':
             return func
-        import mitogen.core
+        import mitogen.parent
-        import mitogen.master
         import mitogen.utils
         if profiling:
             mitogen.core.enable_profiling()

mitogen/core.py

@@ -541,7 +541,6 @@ def is_blacklisted_import(importer, fullname):
     any packages have been whitelisted and `fullname` is not part of one.
 
     NB:
-      - The default whitelist is `['']` which matches any module name.
       - If a package is on both lists, then it is treated as blacklisted.
       - If any package is whitelisted, then all non-whitelisted packages are
         treated as blacklisted.
@@ -1301,7 +1300,6 @@ class Importer(object):
         'kubectl',
         'fakessh',
         'fork',
-        'imports',
         'jail',
         'lxc',
         'lxd',
@@ -1537,8 +1535,9 @@ class Importer(object):
         return importlib.machinery.ModuleSpec(fullname, loader=self)
 
     blacklisted_msg = (
-        'A %r request would be refused by the Mitogen master. The module is '
+        '%r is present in the Mitogen importer blacklist, therefore this '
-        'on the deny list (blacklist) or not on the allow list (whitelist).'
+        'context will not attempt to request it from the master, as the '
+        'request will always be refused.'
     )
     pkg_resources_msg = (
         'pkg_resources is prohibited from importing __main__, as it causes '

mitogen/fakessh.py

@@ -97,6 +97,7 @@ import inspect
 import os
 import pty
 import shutil
+import socket
 import subprocess
 import sys
 import tempfile

mitogen/imports/__init__.py

@@ -1,38 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Mitogen authors <https://github.com/mitogen-hq>
-# SPDX-License-Identifier: BSD-3-Clause
-# !mitogen: minify_safe
-
-import sys
-
-if sys.version_info >= (3, 14):
-    from mitogen.imports._py314 import _code_imports
-elif sys.version_info >= (3, 6):
-    from mitogen.imports._py36 import _code_imports
-elif sys.version_info >= (2, 5):
-    from mitogen.imports._py2 import _code_imports_py25 as _code_imports
-else:
-    from mitogen.imports._py2 import _code_imports_py24 as _code_imports
-
-
-def codeobj_imports(co):
-    """
-    Yield (level, modname, names) tuples by scanning the code object `co`.
-
-    Top level `import mod` & `from mod import foo` statements are matched.
-    Those inside a `class ...` or `def ...` block are currently skipped.
-
-    >>> co = compile('import a, b; from c import d, e as f', '<str>', 'exec')
-    >>> list(codeobj_imports(co))  # doctest: +ELLIPSIS
-    [(..., 'a', ()), (..., 'b', ()), (..., 'c', ('d', 'e'))]
-
-    :return:
-        Generator producing `(level, modname, names)` tuples, where:
-
-        * `level`:
-            -1 implicit relative (Python 2.x default)
-            0  absolute (Python 3.x, `from __future__ import absolute_import`)
-            >0 explicit relative (`from . import a`, `from ..b, import c`)
-        * `modname`: Name of module to import, or to import `names` from.
-        * `names`: tuple of names in `from mod import ..`.
-    """
-    return _code_imports(co.co_code, co.co_consts, co.co_names)

mitogen/imports/_py2.py

@@ -1,54 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Mitogen authors <https://github.com/mitogen-hq>
-# SPDX-License-Identifier: BSD-3-Clause
-# !mitogen: minify_safe
-
-import array
-import itertools
-import opcode
-
-
-IMPORT_NAME = opcode.opmap['IMPORT_NAME']
-LOAD_CONST = opcode.opmap['LOAD_CONST']
-
-
-def _opargs(code, _have_arg=opcode.HAVE_ARGUMENT):
-    it = iter(array.array('B', code))
-    nexti = it.next
-    for i in it:
-        if i >= _have_arg:
-            yield (i, nexti() | (nexti() << 8))
-        else:
-            yield (i, None)
-
-
-def _code_imports_py25(code, consts, names):
-    it1, it2, it3 = itertools.tee(_opargs(code), 3)
-    try:
-        next(it2)
-        next(it3)
-        next(it3)
-    except StopIteration:
-        return
-    for oparg1, oparg2, (op3, arg3) in itertools.izip(it1, it2, it3):
-        if op3 != IMPORT_NAME:
-            continue
-        op1, arg1 = oparg1
-        op2, arg2 = oparg2
-        if op1 != LOAD_CONST or op2 != LOAD_CONST:
-            continue
-        yield (consts[arg1], names[arg3], consts[arg2] or ())
-
-
-def _code_imports_py24(code, consts, names):
-    it1, it2 = itertools.tee(_opargs(code), 2)
-    try:
-        next(it2)
-    except StopIteration:
-        return
-    for oparg1, (op2, arg2) in itertools.izip(it1, it2):
-        if op2 != IMPORT_NAME:
-            continue
-        op1, arg1 = oparg1
-        if op1 != LOAD_CONST:
-            continue
-        yield (-1, names[arg2], consts[arg1] or ())

mitogen/imports/_py314.py

@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Mitogen authors <https://github.com/mitogen-hq>
-# SPDX-License-Identifier: BSD-3-Clause
-# !mitogen: minify_safe
-
-import opcode
-
-IMPORT_NAME = opcode.opmap['IMPORT_NAME']
-LOAD_CONST = opcode.opmap['LOAD_CONST']
-LOAD_SMALL_INT = opcode.opmap['LOAD_SMALL_INT']
-
-
-def _code_imports(code, consts, names):
-    start = 4
-    while True:
-        op3_idx = code.find(IMPORT_NAME, start, -1)
-        if op3_idx < 0:
-            return
-        if op3_idx % 2:
-            start = op3_idx + 1
-            continue
-        if code[op3_idx-4] != LOAD_SMALL_INT or code[op3_idx-2] != LOAD_CONST:
-            start = op3_idx + 2
-            continue
-        start = op3_idx + 6
-        arg1, arg2, arg3 = code[op3_idx-3], code[op3_idx-1], code[op3_idx+1]
-        yield (arg1, names[arg3], consts[arg2] or ())

mitogen/imports/_py36.py

@@ -1,25 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Mitogen authors <https://github.com/mitogen-hq>
-# SPDX-License-Identifier: BSD-3-Clause
-# !mitogen: minify_safe
-
-import opcode
-
-IMPORT_NAME = opcode.opmap['IMPORT_NAME']
-LOAD_CONST = opcode.opmap['LOAD_CONST']
-
-
-def _code_imports(code, consts, names):
-    start = 4
-    while True:
-        op3_idx = code.find(IMPORT_NAME, start, -1)
-        if op3_idx < 0:
-            return
-        if op3_idx % 2:
-            start = op3_idx + 1
-            continue
-        if code[op3_idx-4] != LOAD_CONST or code[op3_idx-2] != LOAD_CONST:
-            start = op3_idx + 2
-            continue
-        start = op3_idx + 6
-        arg1, arg2, arg3 = code[op3_idx-3], code[op3_idx-1], code[op3_idx+1]
-        yield (consts[arg1], names[arg3], consts[arg2] or ())

mitogen/master.py

@@ -35,8 +35,10 @@ be sent to any context that will be used to establish additional child
 contexts.
 """
 
+import dis
 import errno
 import inspect
+import itertools
 import logging
 import os
 import pkgutil
@@ -81,7 +83,6 @@ except ImportError:
 
 import mitogen
 import mitogen.core
-import mitogen.imports
 import mitogen.minify
 import mitogen.parent
 
@@ -89,10 +90,14 @@ from mitogen.core import any
 from mitogen.core import b
 from mitogen.core import IOLOG
 from mitogen.core import LOG
+from mitogen.core import next
 from mitogen.core import str_partition
 from mitogen.core import str_rpartition
 from mitogen.core import to_text
 
+imap = getattr(itertools, 'imap', map)
+izip = getattr(itertools, 'izip', zip)
+
 RLOG = logging.getLogger('mitogen.ctx')
 
 
@@ -248,6 +253,80 @@ if mitogen.is_master:
     mitogen.parent._get_core_source = _get_core_source
 
 
+LOAD_CONST = dis.opname.index('LOAD_CONST')
+IMPORT_NAME = dis.opname.index('IMPORT_NAME')
+
+
+def _getarg(nextb, c):
+    if c >= dis.HAVE_ARGUMENT:
+        return nextb() | (nextb() << 8)
+
+
+if sys.version_info < (3, 0):
+    def iter_opcodes(co):
+        # Yield `(op, oparg)` tuples from the code object `co`.
+        ordit = imap(ord, co.co_code)
+        nextb = ordit.next
+        return ((c, _getarg(nextb, c)) for c in ordit)
+elif sys.version_info < (3, 6):
+    def iter_opcodes(co):
+        # Yield `(op, oparg)` tuples from the code object `co`.
+        ordit = iter(co.co_code)
+        nextb = ordit.__next__
+        return ((c, _getarg(nextb, c)) for c in ordit)
+else:
+    def iter_opcodes(co):
+        # Yield `(op, oparg)` tuples from the code object `co`.
+        ordit = iter(co.co_code)
+        nextb = ordit.__next__
+        # https://github.com/abarnert/cpython/blob/c095a32f/Python/wordcode.md
+        return ((c, nextb()) for c in ordit)
+
+
+def scan_code_imports(co):
+    """
+    Given a code object `co`, scan its bytecode yielding any ``IMPORT_NAME``
+    and associated prior ``LOAD_CONST`` instructions representing an `Import`
+    statement or `ImportFrom` statement.
+
+    :return:
+        Generator producing `(level, modname, namelist)` tuples, where:
+
+        * `level`: -1 for normal import, 0, for absolute import, and >0 for
+          relative import.
+        * `modname`: Name of module to import, or from where `namelist` names
+          are imported.
+        * `namelist`: for `ImportFrom`, the list of names to be imported from
+          `modname`.
+    """
+    opit = iter_opcodes(co)
+    opit, opit2, opit3 = itertools.tee(opit, 3)
+
+    try:
+        next(opit2)
+        next(opit3)
+        next(opit3)
+    except StopIteration:
+        return
+
+    if sys.version_info >= (2, 5):
+        for oparg1, oparg2, (op3, arg3) in izip(opit, opit2, opit3):
+            if op3 == IMPORT_NAME:
+                op2, arg2 = oparg2
+                op1, arg1 = oparg1
+                if op1 == op2 == LOAD_CONST:
+                    yield (co.co_consts[arg1],
+                           co.co_names[arg3],
+                           co.co_consts[arg2] or ())
+    else:
+        # Python 2.4 did not yet have 'level', so stack format differs.
+        for oparg1, (op2, arg2) in izip(opit, opit2):
+            if op2 == IMPORT_NAME:
+                op1, arg1 = oparg1
+                if op1 == LOAD_CONST:
+                    yield (-1, co.co_names[arg2], co.co_consts[arg1] or ())
+
+
 class ThreadWatcher(object):
     """
     Manage threads that wait for another thread to shut down, before invoking
@@ -370,19 +449,15 @@ class LogForwarder(object):
         if logger is None:
             self._cache[logger_name] = logger = logging.getLogger(logger_name)
 
-        levelno = int(level_s)
         # See logging.Handler.makeRecord()
-        record = logging.makeLogRecord(
+        record = logging.LogRecord(
-            {
+            name=logger.name,
-                "name": logger.name,
+            level=int(level_s),
-                "levelname": logging.getLevelName(levelno),
+            pathname='(unknown file)',
-                "levelno": levelno,
+            lineno=0,
-                "pathname": "(unknown file)",
+            msg=s,
-                "lineno": 0,
+            args=(),
-                "msg": s,
+            exc_info=None,
-                "args": (),
-                "exc_info": None,
-            }
         )
         record.mitogen_message = s
         record.mitogen_context = self._router.context_by_id(msg.src_id)
@@ -843,12 +918,6 @@ class ModuleFinder(object):
     related modules likely needed by a child context requesting the original
     module.
     """
-
-    # Fullnames of modules that should not be sent as a related module
-    _related_modules_denylist = frozenset({
-        '__main__',
-    })
-
     def __init__(self):
         #: Import machinery is expensive, keep :py:meth`:get_module_source`
         #: results around.
@@ -937,34 +1006,6 @@ class ModuleFinder(object):
             fullname, _, _ = str_rpartition(to_text(fullname), u'.')
             yield fullname
 
-    def _reject_related_module(self, requested_fullname, related_fullname):
-        def _log_reject(reason):
-            LOG.debug(
-                '%r: Rejected related module %s of requested module %s: %s',
-                self, related_fullname, requested_fullname, reason,
-            )
-            return reason
-
-        try:
-            related_module = sys.modules[related_fullname]
-        except KeyError:
-            return _log_reject('sys.modules entry absent')
-
-        # Python 2.x "indirection entry"
-        if related_module is None:
-            return _log_reject('sys.modules entry is None')
-
-        if is_stdlib_name(related_fullname):
-            return _log_reject('stdlib module')
-
-        if 'six.moves' in related_fullname:
-            return _log_reject('six.moves avoidence')
-
-        if related_fullname in self._related_modules_denylist:
-            return _log_reject('on denylist')
-
-        return False
-
     def find_related_imports(self, fullname):
         """
         Return a list of non-stdlib modules that are directly imported by
@@ -988,7 +1029,7 @@ class ModuleFinder(object):
         maybe_names = list(self.generate_parent_names(fullname))
 
         co = compile(src, modpath, 'exec')
-        for level, modname, namelist in mitogen.imports.codeobj_imports(co):
+        for level, modname, namelist in scan_code_imports(co):
             if level == -1:
                 modnames = [modname, '%s.%s' % (fullname, modname)]
             else:
@@ -1007,7 +1048,9 @@ class ModuleFinder(object):
             set(
                 mitogen.core.to_text(name)
                 for name in maybe_names
-                if not self._reject_related_module(fullname, name)
+                if sys.modules.get(name) is not None
+                and not is_stdlib_name(name)
+                and u'six.moves' not in name  # TODO: crap
             )
         ))
 
@@ -1170,7 +1213,7 @@ class ModuleResponder(object):
         self._cache[fullname] = tup
         return tup
 
-    def _send_load_module(self, stream, fullname, reason):
+    def _send_load_module(self, stream, fullname):
         if fullname not in stream.protocol.sent_modules:
             tup = self._build_tuple(fullname)
             msg = mitogen.core.Message.pickled(
@@ -1178,10 +1221,8 @@ class ModuleResponder(object):
                 dst_id=stream.protocol.remote_id,
                 handle=mitogen.core.LOAD_MODULE,
             )
-            self._log.debug(
+            self._log.debug('sending %s (%.2f KiB) to %s',
-                'sending %s %s (%.2f KiB) to %s',
+                            fullname, len(msg.data) / 1024.0, stream.name)
-                reason, fullname, len(msg.data) / 1024.0, stream.name,
-            )
             self._router._async_route(msg)
             stream.protocol.sent_modules.add(fullname)
             if tup[2] is not None:
@@ -1212,8 +1253,8 @@ class ModuleResponder(object):
                     # Parent hasn't been sent, so don't load submodule yet.
                     continue
 
-                self._send_load_module(stream, name, 'related')
+                self._send_load_module(stream, name)
-            self._send_load_module(stream, fullname, 'requested')
+            self._send_load_module(stream, fullname)
         except Exception:
             LOG.debug('While importing %r', fullname, exc_info=True)
             self._send_module_load_failed(stream, fullname)

mitogen/parent.py

@@ -1396,6 +1396,10 @@ class Connection(object):
     # with a custom argv.
     #   * Optimized for minimum byte count after minification & compression.
     #     The script preamble_size.py measures this.
+    #   * 'CONTEXT_NAME' and 'PREAMBLE_COMPRESSED_LEN' are substituted with
+    #     their respective values.
+    #   * CONTEXT_NAME must be prefixed with the name of the Python binary in
+    #     order to allow virtualenvs to detect their install prefix.
     #
     # macOS tweaks for Python 2.7 must be kept in sync with the the Ansible
     # module test_echo_module, used by the integration tests.
@@ -1431,21 +1435,20 @@ class Connection(object):
             os.close(r)
             os.close(W)
             os.close(w)
-            if os.uname()[0]+os.uname()[2][:2]+sys.executable=='Darwin19/usr/bin/python':sys.executable+='2.7'
+            if os.uname()[0]=='Darwin'and os.uname()[2][:2]<'19'and sys.executable=='/usr/bin/python':sys.executable='/usr/bin/python2.7'
-            if os.uname()[0]+os.uname()[2][:2]+sys.version[:3]=='Darwin202.7':os.environ['PYTHON_LAUNCHED_FROM_WRAPPER']='1'
+            if os.uname()[0]=='Darwin'and os.uname()[2][:2]in'2021'and sys.version[:3]=='2.7':os.environ['PYTHON_LAUNCHED_FROM_WRAPPER']='1'
-            if os.uname()[0]+os.uname()[2][:2]+sys.version[:3]=='Darwin212.7':os.environ['PYTHON_LAUNCHED_FROM_WRAPPER']='1'
             os.environ['ARGV0']=sys.executable
-            os.execl(sys.executable,sys.executable+'(mitogen:%s)'%sys.argv[2])
+            os.execl(sys.executable,sys.executable+'(mitogen:CONTEXT_NAME)')
         os.write(1,'MITO000\n'.encode())
-        C=''.encode()
+        fp=os.fdopen(0,'rb')
-        while int(sys.argv[3])-len(C)and select.select([0],[],[]):C+=os.read(0,int(sys.argv[3])-len(C))
+        C=zlib.decompress(fp.read(PREAMBLE_COMPRESSED_LEN))
-        C=zlib.decompress(C)
+        fp.close()
-        f=os.fdopen(W,'wb',0)
+        fp=os.fdopen(W,'wb',0)
-        f.write(C)
+        fp.write(C)
-        f.close()
+        fp.close()
-        f=os.fdopen(w,'wb',0)
+        fp=os.fdopen(w,'wb',0)
-        f.write(C)
+        fp.write(C)
-        f.close()
+        fp.close()
         os.write(1,'MITO001\n'.encode())
         os.close(2)
 
@@ -1466,24 +1469,21 @@ class Connection(object):
         source = inspect.getsource(self._first_stage)
         source = textwrap.dedent('\n'.join(source.strip().split('\n')[2:]))
         source = source.replace('    ', ' ')
-        compressor = zlib.compressobj(
+        source = source.replace('CONTEXT_NAME', self.options.remote_name)
-            zlib.Z_BEST_COMPRESSION, zlib.DEFLATED, -zlib.MAX_WBITS,
+        preamble_compressed = self.get_preamble()
-        )
+        source = source.replace('PREAMBLE_COMPRESSED_LEN',
-        compressed = compressor.compress(source.encode()) + compressor.flush()
+                                str(len(preamble_compressed)))
+        compressed = zlib.compress(source.encode(), 9)
         encoded = binascii.b2a_base64(compressed).replace(b('\n'), b(''))
 
         # Just enough to decode, decompress, and exec the first stage.
         # Priorities: wider compatibility, faster startup, shorter length.
+        # `import os` here, instead of stage 1, to save a few bytes.
         # `sys.path=...` for https://github.com/python/cpython/issues/115911.
-        # `import os,select` here (not stage 1) to save a few bytes overall.
         return self.get_python_argv() + [
             '-c',
-            'import sys;sys.path=[p for p in sys.path if p];'
+            'import sys;sys.path=[p for p in sys.path if p];import binascii,os,zlib;'
-            'import binascii,os,select,zlib;'
+            'exec(zlib.decompress(binascii.a2b_base64("%s")))' % (encoded.decode(),),
-            'exec(zlib.decompress(binascii.a2b_base64(sys.argv[1]),-15))',
-            encoded.decode(),
-            self.options.remote_name,
-            str(len(self.get_preamble())),
         ]
 
     def get_econtext_config(self):

mitogen/ssh.py

@@ -40,7 +40,6 @@ try:
 except ImportError:
     from pipes import quote as shlex_quote
 
-import mitogen.core
 import mitogen.parent
 from mitogen.core import b
 

mitogen/unix.py

@@ -44,7 +44,6 @@ import sys
 import tempfile
 
 import mitogen.core
-import mitogen.parent
 import mitogen.master
 
 

preamble_size.py

@@ -8,7 +8,6 @@ import inspect
 import sys
 import zlib
 
-import mitogen.core
 import mitogen.fakessh
 import mitogen.fork
 import mitogen.master
@@ -19,28 +18,14 @@ import mitogen.service
 import mitogen.ssh
 import mitogen.sudo
 
-
-class Table(object):
-    HEADERS = (' ', 'Original', 'Minimized', 'Compressed')
-    HEAD_FMT = '{:20} {:^15}  {:^19}  {:^19}'
-    ROW_FMT =  '%-20s %6i %5.1fKiB  %5i %4.1fKiB %4.1f%%  %5i %4.1fKiB %4.1f%%'
-
-    def header(self):
-        return self.HEAD_FMT.format(*self.HEADERS)
-
-
 router = mitogen.master.Router()
 context = mitogen.parent.Context(router, 0)
-options = mitogen.ssh.Options(
+options = mitogen.ssh.Options(max_message_size=0, hostname='foo')
-    hostname='foo',
-    max_message_size=0,
-    remote_name='alice@host:1234',
-)
 conn = mitogen.ssh.Connection(options, router)
 conn.context = context
 
 print('SSH command size: %s' % (len(' '.join(conn.get_boot_command())),))
-print('Preamble (mitogen.core + econtext) size: %s (%.2fKiB)' % (
+print('Bootstrap (mitogen.core) size: %s (%.2fKiB)' % (
     len(conn.get_preamble()),
     len(conn.get_preamble()) / 1024.0,
 ))
@@ -51,10 +36,17 @@ if '--dump' in sys.argv:
     exit()
 
 
-table = Table()
+print(
-print(table.header())
+    '                           '
+    ' '
+    '  Original   '
+    '  '
+    '     Minimized     '
+    '  '
+    '    Compressed     '
+)
+
 for mod in (
-        mitogen.core,
         mitogen.parent,
         mitogen.fork,
         mitogen.ssh,
@@ -71,7 +63,13 @@ for mod in (
     compressed = zlib.compress(minimized.encode(), 9)
     compressed_size = len(compressed)
     print(
-        table.ROW_FMT
+        '%-25s'
+        ' '
+        '%5i %4.1fKiB'
+        '  '
+        '%5i %4.1fKiB %.1f%%'
+        '  '
+        '%5i %4.1fKiB %.1f%%'
     % (
         mod.__name__,
         original_size,

setup.py

@@ -79,21 +79,19 @@ setup(
     long_description = long_description(),
     long_description_content_type='text/markdown',
     author = 'David Wilson',
-    license = 'BSD-3-Clause',
+    license = 'New BSD',
     url = 'https://github.com/mitogen-hq/mitogen/',
     packages = find_packages(exclude=['tests', 'examples']),
-    python_requires='>=2.4, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*',
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*',
     zip_safe = False,
     classifiers = [
         'Environment :: Console',
         'Framework :: Ansible',
         'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: BSD License',
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: POSIX',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.4',
-        'Programming Language :: Python :: 2.5',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
@@ -104,7 +102,6 @@ setup(
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
-        'Programming Language :: Python :: 3.14',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: System :: Distributed Computing',
         'Topic :: System :: Systems Administration',

tests/ansible/ansible.cfg

@@ -76,7 +76,6 @@ ssh_args =
     -o ControlPersist=60s
     -o ForwardAgent=yes
     -o HostKeyAlgorithms=+ssh-rsa
-    -o KexAlgorithms=+diffie-hellman-group1-sha1
     -o PubkeyAcceptedKeyTypes=+ssh-rsa
     -o UserKnownHostsFile=/dev/null
 pipelining = True

tests/ansible/hosts/group_vars/all.yml

@@ -6,7 +6,6 @@
 ansible_version_major_minor: "{{ ansible_version.major }}.{{ ansible_version.minor }}"
 ansible_version_major_minor_patch: "{{ ansible_version.major }}.{{ ansible_version.minor }}.{{ ansible_version.revision | regex_search('^[0-9]+') }}"
 
-become_doas_available: false
 become_unpriv_available: >-
   {#
     Vanilla Ansible >= 4 (ansible-core >= 2.11) can use `setfacl` for
@@ -35,11 +34,3 @@ become_unpriv_available: >-
   -}}
 
 pkg_mgr_python_interpreter: python
-
-virtualenv_create_argv:
-  - virtualenv
-  - -p
-  - "{{ virtualenv_python }}"
-  - "{{ virtualenv_path }}"
-virtualenv_path: /path/intentionally/left/invalid
-virtualenv_python: /path/intentionally/left/invalid

tests/ansible/hosts/group_vars/alma9.yml

@@ -1,8 +0,0 @@
-pkg_mgr_python_interpreter: python3
-
-# Alma Linux 9, RHEL 9, etc. lack a virtualenv package
-virtualenv_create_argv:
-  - "{{ virtualenv_python }}"
-  - -m
-  - venv
-  - "{{ virtualenv_path }}"

tests/ansible/hosts/group_vars/debian11.yml

@@ -1,4 +1,3 @@
-become_doas_available: true
 package_manager_keys:
   - src: debian-archive-bullseye-automatic.gpg  # Debian 11
     dest: /etc/apt/trusted.gpg.d/debian-archive-bullseye-automatic.gpg

tests/ansible/hosts/group_vars/debian12.yml

@@ -1,2 +0,0 @@
-become_doas_available: true
-pkg_mgr_python_interpreter: python3

tests/ansible/hosts/group_vars/debian9.yml

@@ -1,6 +1,4 @@
 package_manager_repos:
   - dest: /etc/apt/sources.list
     content: |
-      deb http://archive.debian.org/debian/ stretch main contrib non-free
+      deb http://archive.debian.org/debian stretch main contrib non-free
-      deb http://archive.debian.org/debian/ stretch-proposed-updates main contrib non-free
-      deb http://archive.debian.org/debian-security stretch/updates main contrib non-free

tests/ansible/hosts/group_vars/ubuntu2204.yml

@@ -1,2 +0,0 @@
-become_doas_available: true
-pkg_mgr_python_interpreter: python3

tests/ansible/hosts/group_vars/ubuntu2404.yml

@@ -1,2 +0,0 @@
-become_doas_available: true
-pkg_mgr_python_interpreter: python3

tests/ansible/integration/become/doas.yml

@@ -15,16 +15,12 @@
       changed_when: false
       check_mode: false
       register: doas_default_user
-      when:
-        - become_doas_available
 
     - assert:
         that:
           - doas_default_user.stdout == 'root'
         fail_msg:
           doas_default_user={{ doas_default_user }}
-      when:
-        - become_doas_available
 
     - name: Test doas -> mitogen__user1
       become: true
@@ -34,7 +30,6 @@
       check_mode: false
       register: doas_mitogen__user1
       when:
-        - become_doas_available
         - become_unpriv_available
 
     - assert:
@@ -43,7 +38,6 @@
         fail_msg:
           doas_mitogen__user1={{ doas_mitogen__user1 }}
       when:
-        - become_doas_available
         - become_unpriv_available
   tags:
     - doas
@@ -67,16 +61,12 @@
       changed_when: false
       check_mode: false
       register: fq_doas_default_user
-      when:
-        - become_doas_available
 
     - assert:
         that:
           - fq_doas_default_user.stdout == 'root'
         fail_msg:
           fq_doas_default_user={{ fq_doas_default_user }}
-      when:
-        - become_doas_available
 
     - name: Test community.general.doas -> mitogen__user1
       become: true
@@ -86,7 +76,6 @@
       check_mode: false
       register: fq_doas_mitogen__user1
       when:
-        - become_doas_available
         - become_unpriv_available
 
     - assert:
@@ -95,7 +84,6 @@
         fail_msg:
           fq_doas_mitogen__user1={{ fq_doas_mitogen__user1 }}
       when:
-        - become_doas_available
         - become_unpriv_available
   tags:
     - doas

tests/ansible/integration/connection_delegation/delegate_to_template.yml

@@ -47,7 +47,6 @@
                 -o, ControlPersist=60s,
                 -o, ForwardAgent=yes,
                 -o, HostKeyAlgorithms=+ssh-rsa,
-                -o, KexAlgorithms=+diffie-hellman-group1-sha1,
                 -o, PubkeyAcceptedKeyTypes=+ssh-rsa,
                 -o, UserKnownHostsFile=/dev/null,
               ],
@@ -76,7 +75,6 @@
                 -o, ControlPersist=60s,
                 -o, ForwardAgent=yes,
                 -o, HostKeyAlgorithms=+ssh-rsa,
-                -o, KexAlgorithms=+diffie-hellman-group1-sha1,
                 -o, PubkeyAcceptedKeyTypes=+ssh-rsa,
                 -o, UserKnownHostsFile=/dev/null,
               ],

tests/ansible/integration/connection_delegation/stack_construction.yml

@@ -84,7 +84,6 @@
                           -o, ControlPersist=60s,
                           -o, ForwardAgent=yes,
                           -o, HostKeyAlgorithms=+ssh-rsa,
-                          -o, KexAlgorithms=+diffie-hellman-group1-sha1,
                           -o, PubkeyAcceptedKeyTypes=+ssh-rsa,
                           -o, UserKnownHostsFile=/dev/null,
                       ],
@@ -129,7 +128,6 @@
                           -o, ControlPersist=60s,
                           -o, ForwardAgent=yes,
                           -o, HostKeyAlgorithms=+ssh-rsa,
-                          -o, KexAlgorithms=+diffie-hellman-group1-sha1,
                           -o, PubkeyAcceptedKeyTypes=+ssh-rsa,
                           -o, UserKnownHostsFile=/dev/null,
                       ],
@@ -185,7 +183,6 @@
                           -o, ControlPersist=60s,
                           -o, ForwardAgent=yes,
                           -o, HostKeyAlgorithms=+ssh-rsa,
-                          -o, KexAlgorithms=+diffie-hellman-group1-sha1,
                           -o, PubkeyAcceptedKeyTypes=+ssh-rsa,
                           -o, UserKnownHostsFile=/dev/null,
                       ],
@@ -230,7 +227,6 @@
                           -o, ControlPersist=60s,
                           -o, ForwardAgent=yes,
                           -o, HostKeyAlgorithms=+ssh-rsa,
-                          -o, KexAlgorithms=+diffie-hellman-group1-sha1,
                           -o, PubkeyAcceptedKeyTypes=+ssh-rsa,
                           -o, UserKnownHostsFile=/dev/null,
                       ],
@@ -259,7 +255,6 @@
                           -o, ControlPersist=60s,
                           -o, ForwardAgent=yes,
                           -o, HostKeyAlgorithms=+ssh-rsa,
-                          -o, KexAlgorithms=+diffie-hellman-group1-sha1,
                           -o, PubkeyAcceptedKeyTypes=+ssh-rsa,
                           -o, UserKnownHostsFile=/dev/null,
                       ],
@@ -314,7 +309,6 @@
                           -o, ControlPersist=60s,
                           -o, ForwardAgent=yes,
                           -o, HostKeyAlgorithms=+ssh-rsa,
-                          -o, KexAlgorithms=+diffie-hellman-group1-sha1,
                           -o, PubkeyAcceptedKeyTypes=+ssh-rsa,
                           -o, UserKnownHostsFile=/dev/null,
                       ],
@@ -360,7 +354,6 @@
                           -o, ControlPersist=60s,
                           -o, ForwardAgent=yes,
                           -o, HostKeyAlgorithms=+ssh-rsa,
-                          -o, KexAlgorithms=+diffie-hellman-group1-sha1,
                           -o, PubkeyAcceptedKeyTypes=+ssh-rsa,
                           -o, UserKnownHostsFile=/dev/null,
                       ],

tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml

@@ -1,20 +1,58 @@
 # ripped and ported from https://github.com/ansible/ansible/pull/50163/files, when interpreter discovery was added to ansible
 ---
-- name: integration/interpreter_discovery/ansible_2_8_tests.yml, baseline
-  hosts: test-targets
-  strategy: linear
-  tasks:
-    - meta: clear_facts
-    - name: Discover interpreter, linear, auto
-      vars:
-        ansible_python_interpreter: auto
-      ping:
-      register: linear_auto_result
-
 
 - name: integration/interpreter_discovery/ansible_2_8_tests.yml
   hosts: test-targets
   gather_facts: true
+  vars:
+    DISCOVERED_INTERPRETER_EXPECTED_MAP__ANSIBLE_lt_2_12:
+      centos:
+        '6': /usr/bin/python
+        '7': /usr/bin/python
+        '8': /usr/libexec/platform-python
+      debian:
+        '9': /usr/bin/python
+        '10': /usr/bin/python3
+        '11': /usr/bin/python
+        'NA': /usr/bin/python  # Debian 11, Ansible <= 7 (ansible-core <= 2.14)
+        'bullseye/sid': /usr/bin/python  # Debian 11, Ansible 8 - 9 (ansible-core 2.15 - 2.16)
+      ubuntu:
+        '16': /usr/bin/python3
+        '18': /usr/bin/python3
+        '20': /usr/bin/python3
+
+    DISCOVERED_INTERPRETER_EXPECTED_MAP__ANSIBLE_2_12_to_2_16:
+      centos:
+        '6': /usr/bin/python
+        '7': /usr/bin/python
+        '8': /usr/libexec/platform-python
+      debian:
+        '9': /usr/bin/python
+        '10': /usr/bin/python3
+        '11': /usr/bin/python3.9
+        'NA': /usr/bin/python3.9  # Debian 11, Ansible <= 7 (ansible-core <= 2.14)
+        'bullseye/sid': /usr/bin/python3.9  # Debian 11, Ansible 8 - 9 (ansible-core 2.15 - 2.16)
+      ubuntu:
+        '16': /usr/bin/python3
+        '18': /usr/bin/python3
+        '20': /usr/bin/python3
+
+    DISCOVERED_INTERPRETER_EXPECTED_MAP__ANSIBLE_ge_2_17:
+      debian:
+        '10': /usr/bin/python3.7
+        '11': /usr/bin/python3.9
+        'bullseye/sid': /usr/bin/python3.9
+      ubuntu:
+        '20': /usr/bin/python3.8
+
+    discovered_interpreter_expected: >-
+      {%- if ansible_version_major_minor is version('2.12', '<', strict=True) -%}
+      {{ DISCOVERED_INTERPRETER_EXPECTED_MAP__ANSIBLE_lt_2_12[distro][distro_major] }}
+      {%- elif ansible_version_major_minor is version('2.17', '<', strict=True) -%}
+      {{ DISCOVERED_INTERPRETER_EXPECTED_MAP__ANSIBLE_2_12_to_2_16[distro][distro_major] }}
+      {%- else -%}
+      {{ DISCOVERED_INTERPRETER_EXPECTED_MAP__ANSIBLE_ge_2_17[distro][distro_major] }}
+      {%- endif -%}
   tasks:
     - name: can only run these tests on ansible >= 2.8.0
       block:
@@ -27,6 +65,12 @@
             fail_msg: "'ansible_python_interpreter' appears to be set at a high precedence to {{ ansible_python_interpreter }},
                       which breaks this test."
 
+        - name: snag some facts to validate for later
+          set_fact:
+            distro: '{{ ansible_facts.distribution | lower }}'
+            distro_major: '{{ ansible_facts.distribution_major_version }}'
+            system: '{{ ansible_facts.system }}'
+
         - name: test that python discovery is working and that fact persistence makes it only run once
           block:
           - name: clear facts to force interpreter discovery to run
@@ -171,10 +215,16 @@
           - name: Check discovered interpreter matches expected
             assert:
               that:
-                - auto_out.ansible_facts.discovered_interpreter_python == linear_auto_result.ansible_facts.discovered_interpreter_python
+                - auto_out.ansible_facts.discovered_interpreter_python == discovered_interpreter_expected
               fail_msg: |
+                distro={{ distro }}
+                distro_major= {{ distro_major }}
+                system={{ system }}
                 auto_out={{ auto_out }}
-                linear_auto_result={{ linear_auto_result }}
+                discovered_interpreter_expected={{ discovered_interpreter_expected }}
+                ansible_version.full={{ ansible_version.full }}
+            when:
+              - system in ['Linux']
 
           always:
           - meta: clear_facts

tests/ansible/integration/process/unix_socket_cleanup.yml

@@ -14,7 +14,7 @@
       ANSIBLE_CALLBACK_RESULT_FORMAT=json
       ANSIBLE_LOAD_CALLBACK_PLUGINS=false
       ANSIBLE_STRATEGY=mitogen_linear
-      ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o KexAlgorithms=+diffie-hellman-group1-sha1 -o PubkeyAcceptedKeyTypes=+ssh-rsa"
+      ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
       ANSIBLE_VERBOSITY="{{ ansible_verbosity }}"
       ansible -m shell -c local -a whoami
       {% for inv in ansible_inventory_sources %}

tests/ansible/integration/ssh/password.yml

@@ -35,7 +35,7 @@
             ssh_no_password_result.msg is search('SSH password was requested, but none specified')
             or ssh_no_password_result.msg is search('SSH password is incorrect')
             or ssh_no_password_result.msg is search('Invalid/incorrect password')
-            or ssh_no_password_result.msg is search('Permission denied \(publickey(,gssapi-keyex)?(,gssapi-with-mic)?,password(,keyboard-interactive)?\)')
+            or ssh_no_password_result.msg is search('Permission denied \(publickey,password(,keyboard-interactive)?\)')
         fail_msg: |
           ssh_no_password_result={{ ssh_no_password_result }}
 
@@ -72,6 +72,6 @@
           - >-
             ssh_wrong_password_result.msg is search('SSH password is incorrect')
             or ssh_wrong_password_result.msg is search('Invalid/incorrect password')
-            or ssh_no_password_result.msg is search('Permission denied \(publickey(,gssapi-keyex)?(,gssapi-with-mic)?,password(,keyboard-interactive)?\)')
+            or ssh_wrong_password_result.msg is search('Permission denied \(publickey,password(,keyboard-interactive)?\)')
         fail_msg: |
           ssh_wrong_password_result={{ ssh_wrong_password_result }}

tests/ansible/integration/ssh/variables.yml

@@ -22,7 +22,7 @@
         ANSIBLE_CALLBACK_RESULT_FORMAT=json
         ANSIBLE_LOAD_CALLBACK_PLUGINS=false
         ANSIBLE_STRATEGY=mitogen_linear
-        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o KexAlgorithms=+diffie-hellman-group1-sha1 -o PubkeyAcceptedKeyTypes=+ssh-rsa"
+        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
         ANSIBLE_VERBOSITY="{{ ansible_verbosity }}"
         ansible -m shell -a whoami
         {% for inv in ansible_inventory_sources %}
@@ -42,7 +42,7 @@
         ANSIBLE_CALLBACK_RESULT_FORMAT=json
         ANSIBLE_LOAD_CALLBACK_PLUGINS=false
         ANSIBLE_STRATEGY=mitogen_linear
-        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o KexAlgorithms=+diffie-hellman-group1-sha1 -o PubkeyAcceptedKeyTypes=+ssh-rsa"
+        ANSIBLE_SSH_ARGS="-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
         ANSIBLE_VERBOSITY="{{ ansible_verbosity }}"
         ansible -m shell -a whoami
         {% for inv in ansible_inventory_sources %}

tests/ansible/regression/issue_122__environment_difference.yml

@@ -8,12 +8,9 @@
 - name: regression/issue_122__environment_difference.yml
   hosts: test-targets
   tasks:
-    - name: Run print_env.py
+
-      script:
+  - script: scripts/print_env.py
-        cmd: scripts/print_env.py
+    register: env
-        executable: "{{ ansible_python_interpreter | default(ansible_facts.discovered_interpreter_python) }}"
+  - debug: msg={{env}}
-      register: print_env_result
-    - debug:
-        var: print_env_result
   tags:
     - issue_122

tests/ansible/regression/issue_152__virtualenv_python_fails.yml

@@ -1,29 +1,26 @@
 - name: regression/issue_152__virtualenv_python_fails.yml
   gather_facts: true
   hosts: test-targets
-  vars:
-    virtualenv_path: /tmp/issue_152_virtualenv
-    virtualenv_python: "{{ ansible_facts.python.executable }}"
   tasks:
     - custom_python_detect_environment:
       register: lout
 
     # Can't use pip module because it can't create virtualenvs, must call it
     # directly.
-    - name: Create temporary virtualenv
+    - name: Create /tmp/issue_152_virtualenv
       environment:
         https_proxy: "{{ lookup('env', 'https_proxy')|default('') }}"
         no_proxy: "{{ lookup('env', 'no_proxy')|default('') }}"
         PATH: "{{ lookup('env', 'PATH') }}"
       command:
-        argv: "{{ virtualenv_create_argv }}"
+        cmd: virtualenv -p "{{ ansible_facts.python.executable }}" /tmp/issue_152_virtualenv
-        creates: "{{ virtualenv_path }}"
+        creates: /tmp/issue_152_virtualenv
       when:
         - lout.python.version.full is version('2.7', '>=', strict=True)
 
     - custom_python_detect_environment:
       vars:
-        ansible_python_interpreter: "{{ virtualenv_path }}/bin/python"
+        ansible_python_interpreter: /tmp/issue_152_virtualenv/bin/python
       register: out
       when:
         - lout.python.version.full is version('2.7', '>=', strict=True)
@@ -31,7 +28,7 @@
     - name: Check virtualenv was used
       # On macOS runners a symlink /tmp -> /private/tmp has been seen
       vars:
-        requested_executable: "{{ virtualenv_path }}/bin/python"
+        requested_executable: /tmp/issue_152_virtualenv/bin/python
         expected_executables:
           - "{{ requested_executable }}"
           - "{{ requested_executable.replace('/tmp', out.fs['/tmp'].resolved) }}"
@@ -43,9 +40,9 @@
       when:
         - lout.python.version.full is version('2.7', '>=', strict=True)
 
-    - name: Cleanup temporary virtualenv
+    - name: Cleanup /tmp/issue_152_virtualenv
       file:
-        path: "{{ virtualenv_path }}"
+        path: /tmp/issue_152_virtualenv
         state: absent
       when:
         - lout.python.version.full is version('2.7', '>=', strict=True)

tests/ansible/regression/issue_766__get_with_context.yml

@@ -9,8 +9,6 @@
     netconf_container_image: ghcr.io/mitogen-hq/sysrepo-netopeer2:latest
     netconf_container_name: sysrepo
     netconf_container_port: 8030
-    # https://github.com/ansible-collections/ansible.netcommon/issues/698#issuecomment-2910082548
-    ansible_network_import_modules: "{{ (ansible_version_major_minor is version('2.19', '==', strict=True))  | bool }}"
 
   tasks:
     - meta: end_play
@@ -30,6 +28,13 @@
         - ansible_version_major_minor is version('2.11', '>=', strict=True)
         - ansible_version_major_minor is version('2.12', '<', strict=True)
 
+    - meta: end_play
+      when:
+        # TASK [Get running configuration and state data ]
+        # Error: : Task failed: ActionBase._parse_returned_data() missing 1 required positional argument: 'profile'
+        # https://github.com/ansible-collections/ansible.netcommon/issues/698#issuecomment-2910082548
+        - ansible_version_major_minor is version('2.19', '>=', strict=True)
+
     - block:
         - name: Start container
           command:
@@ -58,9 +63,6 @@
           ansible.netcommon.netconf_get:
 
       always:
-        - name: Close connections
-          meta: reset_connection
-
         - name: Cleanup container
           command:
             cmd: podman stop "{{ netconf_container_name }}"

tests/ansible/requirements.txt

@@ -1,6 +1,5 @@
 paramiko==2.12.0;           python_version <= '2.7'
-paramiko==3.5.1;            python_version >= '3.6' and python_version <= '3.8'
+paramiko==3.5.0;            python_version >= '3.6'
-paramiko==4.0.0;            python_version >= '3.9'
 
 # Incompatible with pip >= 72, due to removal of `setup.py test`:
 #   ModuleNotFoundError: No module named 'setuptools.command.test'
@@ -8,8 +7,7 @@ paramiko==4.0.0;            python_version >= '3.9'
 hdrhistogram==0.6.1
 
 ncclient==0.6.13; python_version <= '2.7'
-ncclient==0.6.19;           python_version >= '3.5'
+ncclient==0.6.16; python_version > '2.7'
 
 PyYAML==3.11; python_version < '2.7'
-PyYAML==5.4.1;              python_version >= '2.7' and python_version <= '3.7'
+PyYAML==5.3.1; python_version >= '2.7'  # Latest release (Jan 2021)
-PyYAML==6.0.2;              python_version >= '3.8'

tests/ansible/setup/report_targets.yml

@@ -13,23 +13,3 @@
     - debug: {var: ansible_facts.osversion}
     - debug: {var: ansible_facts.python}
     - debug: {var: ansible_facts.system}
-
-- name: Check target versions
-  hosts: localhost:test-targets
-  check_mode: false
-  tasks:
-    - name: Get command versions
-      command:
-        cmd: "{{ item.cmd }}"
-      changed_when: false
-      check_mode: false
-      loop:
-        - cmd: sudo -V
-      register: command_versions
-
-    - name: Show command versions
-      debug:
-        msg: |
-          cmd: {{ item.item.cmd }}
-          {{ item.stdout }}
-      loop: "{{ command_versions.results }}"

tests/bench/scan_code

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-set -o pipefail
-set -o nounset
-
-BENCH_FUNC="codeobj_imports"
-BENCH_EXPR="deque($BENCH_FUNC(co), maxlen=0)"
-BIG_MODULE_PATH="$(dirname -- "$0")/data/big_module.py"
-IMPORTS="from collections import deque; from mitogen.imports import $BENCH_FUNC"
-COMPILE="co=compile(open('$BIG_MODULE_PATH').read(), '$BIG_MODULE_PATH', 'exec')"
-PYTHONS=(
-    python2.7 python3.{9..14}
-)
-for p in "${PYTHONS[@]}"; do
-    echo -e -n "$BENCH_FUNC $p  "
-    $p -m timeit -s "$IMPORTS" -s "$COMPILE" "$BENCH_EXPR"
-done

tests/context_test.py

@@ -1,6 +1,7 @@
 import pickle
 
 import mitogen.core
+from mitogen.core import b
 
 import testlib
 

tests/data/importer/scanning/defaults.py

@@ -1,11 +0,0 @@
-# pyright: reportMissingImports=false
-# ruff: noqa: E401 E702 F401 F403
-
-import a
-import a.b
-import c as d
-import e, e.f as g \
-    , h; import i
-
-from j import k, l, m as n
-from o import *

tests/data/importer/scanning/explicit_relative.py

@@ -1,9 +0,0 @@
-# pyright: reportMissingImports=false
-# ruff: noqa: E401 E702 F401 F403
-
-from . import a
-from .b import c, d as e
-from ... import (
-    f,
-    j as k,
-)

tests/data/importer/scanning/has_absolute_import.py

@@ -1,13 +0,0 @@
-# pyright: reportMissingImports=false
-# ruff: noqa: E401 E702 F401 F403
-
-from __future__ import absolute_import
-
-import a
-import a.b
-import c as d
-import e, e.f as g \
-    , h; import i
-
-from j import k, l, m as n
-from o import *

tests/data/importer/scanning/scoped_class.py

@@ -1,7 +0,0 @@
-class C:
-    import in_class
-    from in_class import x as y
-
-    def m(self):
-        import in_method
-        from in_method import x as y, z

tests/data/importer/scanning/scoped_function.py

@@ -1,3 +0,0 @@
-def f():
-    import in_func
-    from in_func import x as y, z

tests/data/importer/scanning/scoped_if_else.py

@@ -1,16 +0,0 @@
-import sys
-
-
-if True:
-    import in_if_always_true
-    from in_if_always_true import x as y, z
-else:
-    import in_else_never_true
-    from in_else_never_true import x as y, z
-
-if sys.version >= (3, 0):
-    import in_if_py3
-    from in_if_py3 import x as y, z
-else:
-    import in_else_py2
-    from in_else_py2 import x as y, z

tests/data/importer/scanning/scoped_try_except.py

@@ -1,9 +0,0 @@
-try:
-    import in_try
-    from in_try import x as y, z
-except ImportError:
-    import in_except_importerror
-    from in_except_importerror import x as y, z
-except Exception:
-    import in_except_exception
-    from in_except_exception import x as y, z

tests/data/plain_old_module.py

@@ -12,12 +12,8 @@ class MyError(Exception):
 
 def get_sentinel_value():
     # Some proof we're even talking to the mitogen-test Docker image
-    f = open('/etc/sentinel', 'rb')
+    with open('/etc/sentinel', 'rb') as f:
-    try:
+        return f.read().decode()
-        value = f.read().decode()
-    finally:
-        f.close()
-    return value
 
 
 def add(x, y):

tests/data/stdio_checks.py

@@ -3,24 +3,9 @@ import os
 import sys
 
 
-def _shout_stdout_py3(size):
-    nwritten = sys.stdout.write('A' * size)
-    return nwritten
-
-
-def _shout_stdout_py2(size):
-    shout = 'A' * size
-    nwritten = 0
-    while nwritten < size:
-        nwritten += os.write(sys.stdout.fileno(), shout[-nwritten:])
-    return nwritten
-
-
 def shout_stdout(size):
-    if sys.version_info > (3, 0):
+    sys.stdout.write('A' * size)
-        return _shout_stdout_py3(size)
+    return 'success'
-    else:
-        return _shout_stdout_py2(size)
 
 
 def file_is_blocking(fobj):

tests/first_stage_test.py

@@ -1,6 +1,5 @@
 import subprocess
 
-import mitogen.core
 import mitogen.parent
 from mitogen.core import b
 
@@ -22,18 +21,14 @@ class CommandLineTest(testlib.RouterMixin, testlib.TestCase):
         conn.context = mitogen.core.Context(None, 123)
         args = conn.get_boot_command()
 
-        # The boot command should write an ECO marker to stdout, read the
+        # Executing the boot command will print "EC0" and expect to read from
-        # preamble from stdin, then execute it.
+        # stdin, which will fail because it's pointing at /dev/null, causing
+        # the forked child to crash with an EOFError and disconnect its write
+        # pipe. The forked and freshly execed parent will get a 0-byte read
+        # from the pipe, which is a valid script, and therefore exit indicating
+        # success.
 
-        # This test attaches /dev/zero to stdin to create a specific failure
+        fp = open("/dev/null", "r")
-        # 1. Fork child reads <compressed preamble size> bytes of NUL (`b'\0'`)
-        # 2. Fork child crashes (trying to decompress the junk data)
-        # 3. Fork child's file descriptors (write pipes) are closed by the OS
-        # 4. Fork parent does `dup(<read pipe>, <stdin>)` and `exec(<python>)`
-        # 5. Python reads `b''` (i.e. EOF) from stdin (a closed pipe)
-        # 6. Python runs `''` (a valid script) and exits with success
-
-        fp = open("/dev/zero", "r")
         try:
             proc = subprocess.Popen(args,
                 stdin=fp,
@@ -44,9 +39,6 @@ class CommandLineTest(testlib.RouterMixin, testlib.TestCase):
             self.assertEqual(0, proc.returncode)
             self.assertEqual(stdout,
                 mitogen.parent.BootstrapProtocol.EC0_MARKER+b('\n'))
-            self.assertIn(
+            self.assertIn(b("Error -5 while decompressing data"), stderr)
-                b("Error -3 while decompressing data"),  # Unknown compression method
-                stderr,
-            )
         finally:
             fp.close()

tests/image_prep/_container_create.yml

@@ -3,30 +3,18 @@
   strategy: mitogen_free
   gather_facts: false
   tasks:
+    - name: Fetch container images
+      docker_image:
+        name: "{{ docker_base }}"
+      delegate_to: localhost
+
     - name: Start containers
       docker_container:
         name: "{{ inventory_hostname }}"
         image: "{{ docker_base }}"
         command: /bin/bash
         hostname: "mitogen-{{ inventory_hostname }}"
-        etc_hosts:
-          centos-vault-proxy: host-gateway
         detach: true
         interactive: true
         tty: true
       delegate_to: localhost
-
-    - name: Wait for containers
-      # Can't use wait_for_connection yet, not all base images have a python
-      command: >-
-        docker inspect
-        --format "{% raw %}{{.State.Running}}{% endraw %}"
-        "{{ inventory_hostname }}"
-      register: container_inspect_result
-      retries: 5
-      delay: 10
-      until:
-        - container_inspect_result is succeeded
-        - container_inspect_result.stdout == "true"
-      changed_when: false
-      delegate_to: localhost

tests/image_prep/_container_finalize.yml

@@ -1,7 +1,7 @@
 - name: Prepare images
   hosts: all
   strategy: mitogen_free
-  gather_facts: false
+  gather_facts: true
   tasks:
     - name: Commit containers
       command: >
@@ -10,11 +10,9 @@
         --change 'CMD ["/usr/sbin/sshd", "-D"]'
         {{ inventory_hostname }}
         {{ container_image_name }}
-      changed_when: true
       delegate_to: localhost
 
     - name: Stop containers
       command: >
         docker rm -f {{ inventory_hostname }}
-      changed_when: true
       delegate_to: localhost

tests/image_prep/_container_host.yml

@@ -1,5 +0,0 @@
-- name: Setup container host
-  hosts: localhost
-  become: true
-  roles:
-    - role: container_host

tests/image_prep/_container_setup.yml

@@ -2,44 +2,113 @@
   hosts: all
   strategy: linear
   gather_facts: false
-  roles:
+  tasks:
-    - role: bootstrap
+    - name: Install bootstrap packages
+      raw: |
+        set -o errexit
+        set -o nounset
+        if type -p yum; then
+          yum -y install {{ bootstrap_packages | join(' ') }}
+        else
+          apt-get -y update
+          apt-get -y --no-install-recommends install {{ bootstrap_packages | join(' ') }}
+        fi
+      when: bootstrap_packages | length
 
 - name: Setup containers
   hosts: all
   strategy: mitogen_free
+  # Resource limitation, my laptop freezes doing every container concurrently
+  serial: 4
   # Can't gather facts before here.
   gather_facts: true
   vars:
     distro: "{{ansible_distribution}}"
 
+  pre_tasks:
+    - meta: end_play
+      when:
+        - ansible_facts.virtualization_type != "docker"
+
   roles:
     - role: package_manager
-    - role: packages
     - role: sshd
     - role: sshd_container
 
   tasks:
+    - name: Ensure requisite apt packages are installed
+      apt:
+        name: "{{ common_packages + packages }}"
+        state: present
+        install_recommends: false
+        update_cache: true
+      when: ansible_pkg_mgr == 'apt'
+
+    - name: Ensure requisite yum packages are installed
+      yum:
+        name: "{{ common_packages + packages }}"
+        state: present
+        update_cache: true
+      when: ansible_pkg_mgr == 'yum'
+
+    - name: Ensure requisite dnf packages are installed
+      dnf:
+        name: "{{ common_packages + packages }}"
+        state: present
+        update_cache: true
+      when: ansible_pkg_mgr == 'dnf'
+
+    - name: Clean up package cache
+      vars:
+        clean_command:
+          apt: apt-get clean
+          yum: yum clean all
+          dnf: dnf clean all
+      command: "{{ clean_command[ansible_pkg_mgr] }}"
+      args:
+        warn: "{{ False if ansible_version_major_minor is version('2.10', '<=', strict=True) else omit }}"
+
+    - name: Clean up apt package lists
+      shell: rm -rf {{item}}/*
+      with_items:
+      - /var/cache/apt
+      - /var/lib/apt/lists
+      when: ansible_pkg_mgr == 'apt'
+
+    - name: Configure /usr/bin/python
+      command: alternatives --set python /usr/bin/python3.8
+      args:
+        creates: /usr/bin/python
+      when: inventory_hostname in ["centos8"]
+
     - name: Enable UTF-8 locale on Debian
       copy:
         dest: /etc/locale.gen
         content: |
           en_US.UTF-8 UTF-8
           fr_FR.UTF-8 UTF-8
-        mode: u=rw,go=r
       when: ansible_pkg_mgr == 'apt'
 
     - name: Generate UTF-8 locale on Debian
-      command:
+      shell: locale-gen
-        cmd: locale-gen
-      changed_when: true
       when: ansible_pkg_mgr == 'apt'
 
     - name: Write Unicode into /etc/environment
       copy:
         dest: /etc/environment
         content: "UNICODE_SNOWMAN=\u2603\n"
-        mode: u=rw,go=r
+
+    - name: Install prebuilt 'doas' binary
+      unarchive:
+        dest: /
+        src: ../data/docker/doas-debian.tar.gz
+
+    - name: Make prebuilt 'doas' binary executable
+      file:
+        path: /usr/local/bin/doas
+        mode: 'u=rwxs,go=rx'
+        owner: root
+        group: root
 
     - name: Install doas.conf
       copy:
@@ -47,7 +116,6 @@
         content: |
           permit :mitogen__group
           permit :root
-        mode: u=rw,go=
 
     - name: Set root user password and shell
       user:
@@ -59,7 +127,6 @@
       file:
         path: /var/run/sshd
         state: directory
-        mode: u=rwx,go=rx
 
     - name: Generate SSH host key
       command: ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
@@ -75,7 +142,6 @@
         dest: /etc/sentinel
         content: |
           i-am-mitogen-test-docker-image
-        mode: u=rw,go=r
 
     - name: Ensure /etc/sudoers.d exists
       file:

tests/image_prep/_user_accounts.yml

@@ -50,10 +50,7 @@
     mitogen_test_groups:
       - name: mitogen__group
       - name: mitogen__sudo_nopw
-
+  tasks:
-    user_policies_max_failed_logins: 1000
-    user_policies_users: "{{ all_users }}"
-  pre_tasks:
     - name: Disable non-localhost SSH for Mitogen users
       when: false
       blockinfile:
@@ -157,14 +154,15 @@
             owner: mitogen__has_sudo_pubkey
             group: mitogen__group
 
-    - name: Configure sudoers
+    - name: Configure sudoers defaults
-      copy:
+      blockinfile:
-        src: "{{ item.src }}"
+        path: /etc/sudoers
-        dest: "{{ item.dest }}"
+        marker: "# {mark} Mitogen test defaults"
-        mode: ug=r,o=
+        block: |
+          Defaults>mitogen__pw_required targetpw
+          Defaults>mitogen__require_tty requiretty
+          Defaults>mitogen__require_tty_pw_required requiretty,targetpw
         validate: '/usr/sbin/visudo -cf %s'
-      with_items:
-        - {src: sudoers_defaults, dest: /etc/sudoers.d/mitogen_test_defaults}
 
     - name: Configure sudoers users
       blockinfile:
@@ -181,6 +179,4 @@
           {% endfor %}
         validate: '/usr/sbin/visudo -cf %s'
       when:
-        - ansible_connection == "local"
+        - ansible_virtualization_type != "docker"
-  roles:
-    - role: user_policies

tests/image_prep/ansible.cfg

@@ -1,17 +1,12 @@
 
 [defaults]
-any_errors_fatal = true
-# Ansible >= 6 (ansible-core >= 2.13)
-callback_result_format = yaml
 deprecation_warnings = false
-duplicate_dict_key = error
-inventory = hosts.ini
 strategy_plugins = ../../ansible_mitogen/plugins/strategy
 retry_files_enabled = false
+display_args_to_stdout = True
 no_target_syslog = True
 host_key_checking = False
+stdout_callback = yaml
 
 [inventory]
-any_unparsed_is_failed = true
+unparsed_is_fatal = true
-host_pattern_mismatch = error
-unparsed_is_failed = true

tests/image_prep/apache_proxy.conf

@@ -1,33 +0,0 @@
-DefaultRuntimeDir ${XDG_RUNTIME_DIR}
-PidFile ${XDG_RUNTIME_DIR}/apache2.pid
-
-LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
-LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
-LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so
-LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so
-LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
-LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
-LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
-
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-
-KeepAlive On
-Listen 8090
-
-<Directory />
-    Require all denied
-    AllowOverride None
-</Directory>
-
-<VirtualHost *:8090>
-    ServerName centos-vault-proxy
-    SSLProxyEngine On
-    CustomLog logs/access.log vhost_combined
-    ProxyPass "/" "https://vault.centos.org/"
-    ProxyPassReverse "https://vault.centos.org/" "/"
-    RedirectMatch "^/(.*)" "http://centos-vault-proxy:8090/$1"
-</VirtualHost>
-
-# /usr/sbin/apache2 -d . -f apache_proxy.conf -D FOREGROUND
-
-# vim: syntax=apache

tests/image_prep/files/sudoers_defaults

@@ -1,7 +0,0 @@
-# Testing non-blocking stdio during bootstrap
-# https://github.com/mitogen-hq/mitogen/issues/1306
-Defaults log_output
-
-Defaults>mitogen__pw_required targetpw
-Defaults>mitogen__require_tty requiretty
-Defaults>mitogen__require_tty_pw_required requiretty,targetpw