From 7bc21b6b41fa7ea086bd14a2423b9971473efcba 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 tests/unit/modules/conftest.py Replace deprecated module_utils imports: - ansible.module_utils._text -> ansible.module_utils.common.text.converters - ansible.module_utils.six.string_types -> str - ansible.module_utils.common._collections_compat -> collections.abc Fixes #686 Co-authored-by: Cursor AI Signed-off-by: Pavel Bar --- tests/sanity/ignore-2.21.txt | 1 - tests/unit/modules/conftest.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/sanity/ignore-2.21.txt b/tests/sanity/ignore-2.21.txt index 90f9d69..3cf68c0 100644 --- a/tests/sanity/ignore-2.21.txt +++ b/tests/sanity/ignore-2.21.txt @@ -1,2 +1 @@ tests/utils/shippable/timing.py shebang -tests/unit/modules/conftest.py pylint:ansible-bad-import-from diff --git a/tests/unit/modules/conftest.py b/tests/unit/modules/conftest.py index 6eb5883..01b5593 100644 --- a/tests/unit/modules/conftest.py +++ b/tests/unit/modules/conftest.py @@ -9,14 +9,14 @@ import json import pytest -from ansible.module_utils.six import string_types -from ansible.module_utils._text import to_bytes -from ansible.module_utils.common._collections_compat import MutableMapping +from collections.abc import MutableMapping + +from ansible.module_utils.common.text.converters import to_bytes @pytest.fixture def patch_ansible_module(request, mocker): - if isinstance(request.param, string_types): + if isinstance(request.param, str): args = request.param elif isinstance(request.param, MutableMapping): if 'ANSIBLE_MODULE_ARGS' not in request.param: