From 1b079a3d170ac309bb76fa43bc0bb4e811de508f Mon Sep 17 00:00:00 2001 From: Pavel Bar Date: Sun, 15 Feb 2026 22:56:49 +0200 Subject: [PATCH] Fix deprecated imports in plugins/action/synchronize.py Replace deprecated module_utils imports: - ansible.module_utils._text -> ansible.module_utils.common.text.converters - ansible.module_utils.common._collections_compat -> collections.abc - ansible.module_utils.six.string_types -> str - ansible.module_utils.six.moves.shlex_quote -> shlex.quote Fixes #686 Co-authored-by: Cursor AI Signed-off-by: Pavel Bar --- plugins/action/synchronize.py | 9 ++++----- tests/sanity/ignore-2.21.txt | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/action/synchronize.py b/plugins/action/synchronize.py index a171a2b..8f857c0 100644 --- a/plugins/action/synchronize.py +++ b/plugins/action/synchronize.py @@ -18,12 +18,11 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type import os.path +from collections.abc import MutableSequence +from shlex import quote as shlex_quote from ansible import constants as C -from ansible.module_utils.six import string_types -from ansible.module_utils.six.moves import shlex_quote -from ansible.module_utils._text import to_text -from ansible.module_utils.common._collections_compat import MutableSequence +from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.parsing.convert_bool import boolean from ansible.plugins.action import ActionBase from ansible.plugins.loader import connection_loader @@ -417,7 +416,7 @@ class ActionModule(ActionBase): # Replicate what we do in the module argumentspec handling for lists if not isinstance(_tmp_args.get('rsync_opts'), MutableSequence): tmp_rsync_opts = _tmp_args.get('rsync_opts', []) - if isinstance(tmp_rsync_opts, string_types): + if isinstance(tmp_rsync_opts, str): tmp_rsync_opts = tmp_rsync_opts.split(',') elif isinstance(tmp_rsync_opts, (int, float)): tmp_rsync_opts = [to_text(tmp_rsync_opts)] diff --git a/tests/sanity/ignore-2.21.txt b/tests/sanity/ignore-2.21.txt index 9b5e162..ac7c171 100644 --- a/tests/sanity/ignore-2.21.txt +++ b/tests/sanity/ignore-2.21.txt @@ -1,5 +1,4 @@ tests/utils/shippable/timing.py shebang -plugins/action/synchronize.py pylint:ansible-bad-import-from plugins/callback/cgroup_perf_recap.py pylint:ansible-bad-import-from plugins/modules/mount.py pylint:ansible-bad-import-from plugins/modules/sysctl.py pylint:ansible-bad-import-from