From 17dd3b2e0189e67e55e30058fe673cb8e9cec93c Mon Sep 17 00:00:00 2001 From: Pavel Bar Date: Sun, 15 Feb 2026 22:56:50 +0200 Subject: [PATCH] Fix deprecated imports in plugins/modules/sysctl.py Replace deprecated module_utils imports: - ansible.module_utils._text -> ansible.module_utils.common.text.converters - ansible.module_utils.six.string_types -> basestring/str (Python 2/3 compatible) Fixes #686 Co-authored-by: Cursor AI Signed-off-by: Pavel Bar --- plugins/modules/sysctl.py | 12 ++++++++++-- tests/sanity/ignore-2.21.txt | 1 - tests/sanity/ignore-2.22.txt | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/modules/sysctl.py b/plugins/modules/sysctl.py index 86712db..28c6a52 100644 --- a/plugins/modules/sysctl.py +++ b/plugins/modules/sysctl.py @@ -107,12 +107,20 @@ EXAMPLES = r''' import os import platform import re +import sys import tempfile +# TODO(Python2): On Python 2, string_types is basestring (str + unicode). +# This module may run on target hosts with Python 2.7. +# Remove the Python 2 branch when Python 2 support is dropped. +if sys.version_info >= (3, 0): + string_types = str +else: + string_types = basestring # pylint: disable=undefined-variable + from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.six import string_types +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.parsing.convert_bool import BOOLEANS_FALSE, BOOLEANS_TRUE -from ansible.module_utils._text import to_native class SysctlModule(object): diff --git a/tests/sanity/ignore-2.21.txt b/tests/sanity/ignore-2.21.txt index e1c9cc2..ec0658a 100644 --- a/tests/sanity/ignore-2.21.txt +++ b/tests/sanity/ignore-2.21.txt @@ -1,4 +1,3 @@ -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 tests/unit/mock/procenv.py pylint:ansible-bad-import-from diff --git a/tests/sanity/ignore-2.22.txt b/tests/sanity/ignore-2.22.txt index e1c9cc2..ec0658a 100644 --- a/tests/sanity/ignore-2.22.txt +++ b/tests/sanity/ignore-2.22.txt @@ -1,4 +1,3 @@ -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 tests/unit/mock/procenv.py pylint:ansible-bad-import-from