From c1de972d385f6c7417300314635661237c8d7726 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/modules/mount.py Replace deprecated module_utils imports: - ansible.module_utils._text -> ansible.module_utils.common.text.converters - ansible.module_utils.six.iteritems -> dict.items() Fixes #686 Co-authored-by: Cursor AI Signed-off-by: Pavel Bar --- plugins/modules/mount.py | 5 ++--- tests/sanity/ignore-2.21.txt | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/modules/mount.py b/plugins/modules/mount.py index 6e2425b..682fd4c 100644 --- a/plugins/modules/mount.py +++ b/plugins/modules/mount.py @@ -225,8 +225,7 @@ import platform from ansible.module_utils.basic import AnsibleModule from ansible_collections.ansible.posix.plugins.module_utils.mount import ismount -from ansible.module_utils.six import iteritems -from ansible.module_utils._text import to_bytes, to_native +from ansible.module_utils.common.text.converters import to_bytes, to_native from ansible.module_utils.parsing.convert_bool import boolean @@ -279,7 +278,7 @@ def _set_mount_save_old(module, args): old_lines = [] exists = False changed = False - escaped_args = dict([(k, _escape_fstab(v)) for k, v in iteritems(args)]) + escaped_args = dict([(k, _escape_fstab(v)) for k, v in args.items()]) new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n' if platform.system() == 'SunOS': diff --git a/tests/sanity/ignore-2.21.txt b/tests/sanity/ignore-2.21.txt index ac7c171..2abdfc0 100644 --- a/tests/sanity/ignore-2.21.txt +++ b/tests/sanity/ignore-2.21.txt @@ -1,6 +1,5 @@ tests/utils/shippable/timing.py shebang 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 plugins/shell/csh.py pylint:ansible-bad-import-from plugins/shell/fish.py pylint:ansible-bad-import-from