From 9b4688247872ae7dcf1b13d760559efd6ff548fd Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Tue, 2 Dec 2025 12:59:58 +0000 Subject: [PATCH] ansible_mitogen: Remove a use of ansible.module_utils.six --- ansible_mitogen/target.py | 7 +++---- docs/changelog.rst | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ansible_mitogen/target.py b/ansible_mitogen/target.py index 6e128af4..199f3a14 100644 --- a/ansible_mitogen/target.py +++ b/ansible_mitogen/target.py @@ -40,7 +40,6 @@ import errno import grp import json import logging -import operator import os import pty import pwd @@ -66,8 +65,6 @@ 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 @@ -718,7 +715,9 @@ def apply_mode_spec(spec, mode): mask = CHMOD_MASKS[ch] bits = CHMOD_BITS[ch] cur_perm_bits = mode & mask - new_perm_bits = reduce(operator.or_, (bits[p] for p in perms), 0) + new_perm_bits = 0 + for perm in perms: + new_perm_bits |= bits[perm] mode &= ~mask if op == '=': mode |= new_perm_bits diff --git a/docs/changelog.rst b/docs/changelog.rst index c8e9c59d..ce87cb01 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -22,6 +22,8 @@ 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`` v0.3.35 (2025-12-01) --------------------