From 9b91a1a529d3e77f94454247b87f7044d4e23bec Mon Sep 17 00:00:00 2001 From: Alex Willmer Date: Fri, 31 Jan 2025 12:16:42 +0000 Subject: [PATCH] ansible_mitogen: Fix TypeError in set_file_owner() fixes #1234 --- ansible_mitogen/target.py | 9 ++++----- docs/changelog.rst | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ansible_mitogen/target.py b/ansible_mitogen/target.py index ee4cb398f..33bcb107a 100644 --- a/ansible_mitogen/target.py +++ b/ansible_mitogen/target.py @@ -647,11 +647,10 @@ def set_file_owner(path, owner, group=None, fd=None): else: gid = os.getegid() - if fd is not None and hasattr(os, 'fchown'): - os.fchown(fd, (uid, gid)) + if fd is not None: + os.fchown(fd, uid, gid) else: - # Python<2.6 - os.chown(path, (uid, gid)) + os.chown(path, uid, gid) def write_path(path, s, owner=None, group=None, mode=None, @@ -741,7 +740,7 @@ def set_file_mode(path, spec, fd=None): mode = os.stat(path).st_mode new_mode = apply_mode_spec(spec, mode) - if fd is not None and hasattr(os, 'fchmod'): + if fd is not None: os.fchmod(fd, new_mode) else: os.chmod(path, new_mode) diff --git a/docs/changelog.rst b/docs/changelog.rst index 016b960f4..8626f58fd 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -36,6 +36,8 @@ In progress (unreleased) ``_low_level_execute_command()`` * :gh:issue:`1227` tests: Name transport_config tests that use ``mitogen_via`` * :gh:issue:`1143` :mod:`ansible_mitogen`: Fix dnf module include for dnf.cli +* :gh:issue:`1234` :mod:`ansible_mitogen`: Fix :exc:`TypeError` in + :func:`ansible_mitogen.target.set_file_owner` v0.3.21 (2025-01-20)