[stable-10] Avoid six in plugin code (#10873) (#10877)

Avoid six in plugin code (#10873)

Avoid six in plugin code.

(cherry picked from commit 6cd4665)

Author: felixfontein

changelogs/fragments/10873-six.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - "Avoid usage of deprecated ``ansible.module_utils.six`` in all code that does not have to support Python 2 (https://github.com/ansible-collections/community.general/pull/10873)."

plugins/become/pmrun.py

@@ -59,8 +59,8 @@
   - This plugin ignores the C(become_user) supplied and uses C(pmrun)'s own configuration to select the user.
 """
 
+from shlex import quote as shlex_quote
 from ansible.plugins.become import BecomeBase
-from ansible.module_utils.six.moves import shlex_quote
 
 
 class BecomeModule(BecomeBase):

plugins/cache/pickle.py

@@ -48,7 +48,6 @@
 except ImportError:
     import pickle
 
-from ansible.module_utils.six import PY3
 from ansible.plugins.cache import BaseFileCacheModule
 
 
@@ -61,10 +60,7 @@ class CacheModule(BaseFileCacheModule):
     def _load(self, filepath):
         # Pickle is a binary format
         with open(filepath, 'rb') as f:
-            if PY3:
-                return pickle.load(f, encoding='bytes')
-            else:
-                return pickle.load(f)
+            return pickle.load(f, encoding='bytes')
 
     def _dump(self, value, filepath):
         with open(filepath, 'wb') as f:

plugins/callback/dense.py

@@ -27,7 +27,6 @@
 except ImportError:
     pass
 
-from ansible.module_utils.six import binary_type, text_type
 from collections.abc import MutableMapping, MutableSequence
 from ansible.plugins.callback.default import CallbackModule as CallbackModule_default
 from ansible.utils.color import colorize, hostcolor
@@ -236,7 +235,7 @@ def _clean_results(self, result):
 
         # Remove empty attributes (list, dict, str)
         for attr in result.copy():
-            if isinstance(result[attr], (MutableSequence, MutableMapping, binary_type, text_type)):
+            if isinstance(result[attr], (MutableSequence, MutableMapping, bytes, str)):
                 if not result[attr]:
                     del result[attr]
 

plugins/callback/elastic.py

@@ -87,7 +87,6 @@
 from os.path import basename
 
 from ansible.errors import AnsibleError, AnsibleRuntimeError
-from ansible.module_utils.six import raise_from
 from ansible.plugins.callback import CallbackBase
 
 try:
@@ -312,9 +311,7 @@ def __init__(self, display=None):
         self.disabled = False
 
         if ELASTIC_LIBRARY_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('The `elastic-apm` must be installed to use this plugin'),
-                ELASTIC_LIBRARY_IMPORT_ERROR)
+            raise AnsibleError('The `elastic-apm` must be installed to use this plugin') from ELASTIC_LIBRARY_IMPORT_ERROR
 
         self.tasks_data = OrderedDict()
 

plugins/callback/nrdp.py

@@ -66,7 +66,8 @@
     type: string
 """
 
-from ansible.module_utils.six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
+
 from ansible.module_utils.common.text.converters import to_bytes
 from ansible.module_utils.urls import open_url
 from ansible.plugins.callback import CallbackBase

plugins/callback/opentelemetry.py

@@ -137,14 +137,12 @@
 import os
 import socket
 import uuid
-from time import time_ns
-
 from collections import OrderedDict
 from os.path import basename
+from time import time_ns
+from urllib.parse import urlparse
 
 from ansible.errors import AnsibleError
-from ansible.module_utils.six import raise_from
-from ansible.module_utils.six.moves.urllib.parse import urlparse
 from ansible.plugins.callback import CallbackBase
 
 try:
@@ -499,9 +497,9 @@ def __init__(self, display=None):
         self.otel_exporter_otlp_traces_protocol = None
 
         if OTEL_LIBRARY_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('The `opentelemetry-api`, `opentelemetry-exporter-otlp` or `opentelemetry-sdk` must be installed to use this plugin'),
-                OTEL_LIBRARY_IMPORT_ERROR)
+            raise AnsibleError(
+                'The `opentelemetry-api`, `opentelemetry-exporter-otlp` or `opentelemetry-sdk` must be installed to use this plugin'
+            ) from OTEL_LIBRARY_IMPORT_ERROR
 
         self.tasks_data = OrderedDict()
 

plugins/connection/chroot.py

@@ -75,11 +75,11 @@
 import os.path
 import subprocess
 import traceback
+from shlex import quote as shlex_quote
 
 from ansible.errors import AnsibleError
 from ansible.module_utils.basic import is_executable
 from ansible.module_utils.common.process import get_bin_path
-from ansible.module_utils.six.moves import shlex_quote
 from ansible.module_utils.common.text.converters import to_bytes
 from ansible.plugins.connection import ConnectionBase, BUFSIZE
 from ansible.utils.display import Display

plugins/connection/jail.py

@@ -38,9 +38,9 @@
 import os.path
 import subprocess
 import traceback
+from shlex import quote as shlex_quote
 
 from ansible.errors import AnsibleError
-from ansible.module_utils.six.moves import shlex_quote
 from ansible.module_utils.common.process import get_bin_path
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.plugins.connection import ConnectionBase, BUFSIZE

plugins/connection/zone.py

@@ -31,9 +31,9 @@
 import os.path
 import subprocess
 import traceback
+from shlex import quote as shlex_quote
 
 from ansible.errors import AnsibleError
-from ansible.module_utils.six.moves import shlex_quote
 from ansible.module_utils.common.process import get_bin_path
 from ansible.module_utils.common.text.converters import to_bytes
 from ansible.plugins.connection import ConnectionBase, BUFSIZE