From dd4ca7a8b05deb196e790426426147c43175170c Mon Sep 17 00:00:00 2001 From: Zhiwei Liang Date: Fri, 31 Jul 2026 08:09:54 -0400 Subject: [PATCH] Remove remaining `ansible.module_utils.six` import from kubectl connection plugin (#1197) * Replace ansible.module_utils.six with Python stdlib equivalents ansible.module_utils.six is deprecated in ansible-core 2.21 and is scheduled for removal in 2.24. Every use of it in this collection has a direct Python 3 standard library equivalent, so switch to those. * Update changelogs/fragments/20260723-remove-module-utils-six.yaml Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com> --------- Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com> --- changelogs/fragments/20260723-remove-module-utils-six.yaml | 4 ++++ plugins/connection/kubectl.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/20260723-remove-module-utils-six.yaml diff --git a/changelogs/fragments/20260723-remove-module-utils-six.yaml b/changelogs/fragments/20260723-remove-module-utils-six.yaml new file mode 100644 index 00000000..bdbe2187 --- /dev/null +++ b/changelogs/fragments/20260723-remove-module-utils-six.yaml @@ -0,0 +1,4 @@ +--- +minor_changes: + - Remove the remaining ``ansible.module_utils.six`` import to avoid deprecation + warnings, replacing it with the Python standard library equivalent (https://github.com/ansible-collections/kubernetes.core/pull/1197). diff --git a/plugins/connection/kubectl.py b/plugins/connection/kubectl.py index bdb8311d..e80482fd 100644 --- a/plugins/connection/kubectl.py +++ b/plugins/connection/kubectl.py @@ -262,11 +262,11 @@ import os.path import shutil import subprocess import tempfile +from shlex import quote as shlex_quote from ansible.errors import AnsibleError, AnsibleFileNotFound 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 from ansible.plugins.connection import BUFSIZE, ConnectionBase from ansible.utils.display import Display