From 15423c0a5ae0b8ed5e0d7194ff61caa4d03f5522 Mon Sep 17 00:00:00 2001 From: Sergey <6213510+sshnaidm@users.noreply.github.com> Date: Fri, 29 Aug 2025 11:58:20 +0300 Subject: [PATCH] Fix Ansible sanity issues for new version (#974) Signed-off-by: Sagi Shnaidman --- plugins/module_utils/podman/common.py | 15 +++++---------- plugins/modules/podman_container_exec.py | 3 +-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/plugins/module_utils/podman/common.py b/plugins/module_utils/podman/common.py index 03ecbf5..d932580 100644 --- a/plugins/module_utils/podman/common.py +++ b/plugins/module_utils/podman/common.py @@ -9,22 +9,17 @@ import json import os import shutil -from ansible.module_utils.six import raise_from - try: from ansible.module_utils.compat.version import LooseVersion # noqa: F401 except ImportError: try: from distutils.version import LooseVersion # noqa: F401 except ImportError as exc: - raise_from( - ImportError( - "To use this plugin or module with ansible-core" - " < 2.11, you need to use Python < 3.12 with " - "distutils.version present" - ), - exc, - ) + raise ImportError( + "To use this plugin or module with ansible-core" + " < 2.11, you need to use Python < 3.12 with " + "distutils.version present" + ) from exc ARGUMENTS_OPTS_DICT = { "--attach": ["--attach", "-a"], diff --git a/plugins/modules/podman_container_exec.py b/plugins/modules/podman_container_exec.py index 8d92642..1a6df6a 100644 --- a/plugins/modules/podman_container_exec.py +++ b/plugins/modules/podman_container_exec.py @@ -123,7 +123,6 @@ exec_id: import shlex -from ansible.module_utils.six import string_types from ansible.module_utils._text import to_text from ansible.module_utils.basic import AnsibleModule from ansible_collections.containers.podman.plugins.module_utils.podman.common import ( @@ -159,7 +158,7 @@ def run_container_exec(module: AnsibleModule) -> dict: if env is not None: for key, value in env.items(): - if not isinstance(value, string_types): + if not isinstance(value, str): module.fail_json(msg="Specify string value %s on the env field" % (value)) to_text(value, errors="surrogate_or_strict")