diff --git a/changelogs/fragments/20251228-1053-remove-deprecated-import.yaml b/changelogs/fragments/20251228-1053-remove-deprecated-import.yaml new file mode 100644 index 00000000..6e5e4a3a --- /dev/null +++ b/changelogs/fragments/20251228-1053-remove-deprecated-import.yaml @@ -0,0 +1,2 @@ +minor_changes: +- Remove deprecated import from ``ansible.module_utils._text`` (https://github.com/ansible-collections/kubernetes.core/pull/1053). diff --git a/plugins/action/k8s_info.py b/plugins/action/k8s_info.py index f3429339..390e3264 100644 --- a/plugins/action/k8s_info.py +++ b/plugins/action/k8s_info.py @@ -20,7 +20,7 @@ from ansible.errors import ( AnsibleError, AnsibleFileNotFound, ) -from ansible.module_utils._text import to_bytes, to_native, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.module_utils.parsing.convert_bool import boolean from ansible.plugins.action import ActionBase diff --git a/plugins/connection/kubectl.py b/plugins/connection/kubectl.py index 1f865cd0..bdb8311d 100644 --- a/plugins/connection/kubectl.py +++ b/plugins/connection/kubectl.py @@ -264,7 +264,7 @@ import subprocess import tempfile from ansible.errors import AnsibleError, AnsibleFileNotFound -from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils.parsing.convert_bool import boolean from ansible.module_utils.six.moves import shlex_quote from ansible.parsing.yaml.loader import AnsibleLoader diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py index 8bf92d64..1b9e873d 100644 --- a/plugins/module_utils/common.py +++ b/plugins/module_utils/common.py @@ -23,7 +23,7 @@ import base64 import os from tempfile import NamedTemporaryFile -from ansible.module_utils._text import to_bytes, to_native, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.module_utils.urls import Request try: diff --git a/plugins/module_utils/copy.py b/plugins/module_utils/copy.py index 0e19e17d..7f962856 100644 --- a/plugins/module_utils/copy.py +++ b/plugins/module_utils/copy.py @@ -23,7 +23,7 @@ from abc import ABCMeta, abstractmethod from select import select from tempfile import NamedTemporaryFile, TemporaryFile -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native # from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import AnsibleModule from ansible_collections.kubernetes.core.plugins.module_utils.k8s.exceptions import ( diff --git a/plugins/module_utils/k8s/runner.py b/plugins/module_utils/k8s/runner.py index ade87d57..71d1c316 100644 --- a/plugins/module_utils/k8s/runner.py +++ b/plugins/module_utils/k8s/runner.py @@ -3,7 +3,7 @@ from typing import Dict -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.kubernetes.core.plugins.module_utils.k8s.client import ( get_api_client, ) diff --git a/plugins/modules/k8s_cp.py b/plugins/modules/k8s_cp.py index b18ca556..2e26b54d 100644 --- a/plugins/modules/k8s_cp.py +++ b/plugins/modules/k8s_cp.py @@ -140,7 +140,7 @@ result: import copy -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import ( AnsibleModule, ) diff --git a/plugins/modules/k8s_drain.py b/plugins/modules/k8s_drain.py index 0f1c290b..63a73de3 100644 --- a/plugins/modules/k8s_drain.py +++ b/plugins/modules/k8s_drain.py @@ -149,7 +149,7 @@ import time import traceback from datetime import datetime -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import ( AnsibleModule, ) diff --git a/plugins/modules/k8s_exec.py b/plugins/modules/k8s_exec.py index 6fa58ba2..86ebe775 100644 --- a/plugins/modules/k8s_exec.py +++ b/plugins/modules/k8s_exec.py @@ -131,7 +131,7 @@ except ImportError: # ImportError are managed by the common module already. pass -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import ( AnsibleModule, ) diff --git a/plugins/modules/k8s_json_patch.py b/plugins/modules/k8s_json_patch.py index decef21c..235c4693 100644 --- a/plugins/modules/k8s_json_patch.py +++ b/plugins/modules/k8s_json_patch.py @@ -135,8 +135,8 @@ error: import copy import traceback -from ansible.module_utils._text import to_native from ansible.module_utils.basic import missing_required_lib +from ansible.module_utils.common.text.converters import to_native from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import ( AnsibleModule, ) diff --git a/plugins/modules/k8s_scale.py b/plugins/modules/k8s_scale.py index 6e7d8c44..71f9ce37 100644 --- a/plugins/modules/k8s_scale.py +++ b/plugins/modules/k8s_scale.py @@ -149,7 +149,7 @@ except ImportError: # Handled in module setup pass -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import ( AnsibleModule, ) diff --git a/plugins/modules/k8s_taint.py b/plugins/modules/k8s_taint.py index a7c0ae27..b0c0bd83 100644 --- a/plugins/modules/k8s_taint.py +++ b/plugins/modules/k8s_taint.py @@ -126,7 +126,7 @@ result: import copy -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import ( AnsibleModule, ) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 3e2d7abb..107283c9 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -8,8 +8,8 @@ from io import BytesIO import ansible.module_utils.basic import pytest -from ansible.module_utils._text import to_bytes from ansible.module_utils.common._collections_compat import MutableMapping +from ansible.module_utils.common.text.converters import to_bytes @pytest.fixture