From d43a5a4a4880f2aa55f4ce8a062e81cad35ed3cc Mon Sep 17 00:00:00 2001 From: Sergey <6213510+sshnaidm@users.noreply.github.com> Date: Fri, 16 Jan 2026 15:41:09 +0200 Subject: [PATCH] Fix Ansible warning about test utils (#999) Fix #993 Signed-off-by: Sagi Shnaidman --- plugins/connection/buildah.py | 5 ++++- plugins/connection/podman.py | 5 ++++- plugins/module_utils/podman/podman_container_lib.py | 5 ++++- plugins/module_utils/podman/podman_pod_lib.py | 5 ++++- plugins/modules/podman_container_exec.py | 5 ++++- plugins/modules/podman_network.py | 5 ++++- plugins/modules/podman_volume.py | 5 ++++- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/plugins/connection/buildah.py b/plugins/connection/buildah.py index 8d6bf81..e7fd365 100644 --- a/plugins/connection/buildah.py +++ b/plugins/connection/buildah.py @@ -126,7 +126,10 @@ import subprocess from ansible.errors import AnsibleConnectionFailure from ansible.module_utils.common.process import get_bin_path -from ansible.module_utils._text import to_bytes, to_native, to_text +try: + from ansible.module_utils.common.text.converters import to_native, to_bytes, to_text # noqa: F402 +except ImportError: + from ansible.module_utils.common.text import to_native, to_bytes, to_text # noqa: F402 from ansible.plugins.connection import ConnectionBase, ensure_connect from ansible.utils.display import Display diff --git a/plugins/connection/podman.py b/plugins/connection/podman.py index bd242e9..beae2e5 100644 --- a/plugins/connection/podman.py +++ b/plugins/connection/podman.py @@ -126,7 +126,10 @@ import subprocess from ansible.errors import AnsibleConnectionFailure from ansible.module_utils.common.process import get_bin_path -from ansible.module_utils._text import to_bytes, to_native, to_text +try: + from ansible.module_utils.common.text.converters import to_native, to_bytes, to_text # noqa: F402 +except ImportError: + from ansible.module_utils.common.text import to_native, to_bytes, to_text # noqa: F402 from ansible.plugins.connection import ConnectionBase, ensure_connect from ansible.utils.display import Display diff --git a/plugins/module_utils/podman/podman_container_lib.py b/plugins/module_utils/podman/podman_container_lib.py index 03a61e9..1cadda2 100644 --- a/plugins/module_utils/podman/podman_container_lib.py +++ b/plugins/module_utils/podman/podman_container_lib.py @@ -3,7 +3,10 @@ import json # noqa: F402 import os # noqa: F402 import shlex # noqa: F402 -from ansible.module_utils._text import to_bytes, to_native # noqa: F402 +try: + from ansible.module_utils.common.text.converters import to_native, to_bytes # noqa: F402 +except ImportError: + from ansible.module_utils.common.text import to_native, to_bytes # noqa: F402 from ansible_collections.containers.podman.plugins.module_utils.podman.common import ( LooseVersion, ) diff --git a/plugins/module_utils/podman/podman_pod_lib.py b/plugins/module_utils/podman/podman_pod_lib.py index e668bc9..6867652 100644 --- a/plugins/module_utils/podman/podman_pod_lib.py +++ b/plugins/module_utils/podman/podman_pod_lib.py @@ -1,7 +1,10 @@ from __future__ import absolute_import, division, print_function import json # noqa: F402 -from ansible.module_utils._text import to_bytes, to_native +try: + from ansible.module_utils.common.text.converters import to_native, to_bytes # noqa: F402 +except ImportError: + from ansible.module_utils.common.text import to_native, to_bytes # noqa: F402 from ansible_collections.containers.podman.plugins.module_utils.podman.common import ( LooseVersion, ) diff --git a/plugins/modules/podman_container_exec.py b/plugins/modules/podman_container_exec.py index 1a6df6a..f0c0544 100644 --- a/plugins/modules/podman_container_exec.py +++ b/plugins/modules/podman_container_exec.py @@ -123,7 +123,10 @@ exec_id: import shlex -from ansible.module_utils._text import to_text +try: + from ansible.module_utils.common.text.converters import to_text # noqa: F402 +except ImportError: + from ansible.module_utils.common.text import to_text # noqa: F402 from ansible.module_utils.basic import AnsibleModule from ansible_collections.containers.podman.plugins.module_utils.podman.common import ( run_podman_command, diff --git a/plugins/modules/podman_network.py b/plugins/modules/podman_network.py index e7c99c7..7ed9313 100644 --- a/plugins/modules/podman_network.py +++ b/plugins/modules/podman_network.py @@ -305,7 +305,10 @@ except ImportError: HAS_IP_ADDRESS_MODULE = False from ansible.module_utils.basic import AnsibleModule # noqa: F402 -from ansible.module_utils._text import to_bytes, to_native # noqa: F402 +try: + from ansible.module_utils.common.text.converters import to_native, to_bytes # noqa: F402 +except ImportError: + from ansible.module_utils.common.text import to_native, to_bytes # noqa: F402 from ansible_collections.containers.podman.plugins.module_utils.podman.common import ( LooseVersion, ) diff --git a/plugins/modules/podman_volume.py b/plugins/modules/podman_volume.py index 5c2f41f..d439110 100644 --- a/plugins/modules/podman_volume.py +++ b/plugins/modules/podman_volume.py @@ -154,7 +154,10 @@ import json # noqa: F402 import os # noqa: F402 from ansible.module_utils.basic import AnsibleModule # noqa: F402 -from ansible.module_utils._text import to_bytes, to_native # noqa: F402 +try: + from ansible.module_utils.common.text.converters import to_native, to_bytes # noqa: F402 +except ImportError: + from ansible.module_utils.common.text import to_native, to_bytes # noqa: F402 from ansible_collections.containers.podman.plugins.module_utils.podman.common import ( LooseVersion, )