[PR #10873/6cd46654 backport][stable-11] Avoid six in plugin code (#10875)

Avoid six in plugin code (#10873)

Avoid six in plugin code.

(cherry picked from commit 6cd4665412)

Co-authored-by: Felix Fontein <felix@fontein.de>

plugins/lookup/consul_kv.py

@@ -112,7 +112,8 @@ _raw:
   type: dict
 """
 
-from ansible.module_utils.six.moves.urllib.parse import urlparse
+from urllib.parse import urlparse
+
 from ansible.errors import AnsibleError, AnsibleAssertionError
 from ansible.plugins.lookup import LookupBase
 from ansible.module_utils.common.text.converters import to_text

plugins/lookup/dependent.py

@@ -122,7 +122,6 @@ _list:
 
 from ansible.errors import AnsibleLookupError
 from collections.abc import Mapping, Sequence
-from ansible.module_utils.six import string_types
 from ansible.plugins.lookup import LookupBase
 from ansible.template import Templar
 
@@ -215,7 +214,7 @@ class LookupModule(LookupBase):
                     raise AnsibleLookupError(
                         f'The variable {k!r} appears more than once')
                 vars_so_far.add(k)
-                if isinstance(v, string_types):
+                if isinstance(v, str):
                     data.append((k, v, None))
                 elif isinstance(v, (Sequence, Mapping)):
                     data.append((k, None, v))

plugins/lookup/flattened.py

@@ -37,7 +37,6 @@ _raw:
   type: list
 """
 from ansible.errors import AnsibleError
-from ansible.module_utils.six import string_types
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.listify import listify_lookup_plugin_terms
 
@@ -65,7 +64,7 @@ class LookupModule(LookupBase):
                 # ignore undefined items
                 break
 
-            if isinstance(term, string_types):
+            if isinstance(term, str):
                 # convert a variable to a list
                 term2 = listify_lookup_plugin_terms(term, templar=self._templar)
                 # but avoid converting a plain string to a list of one string

plugins/lookup/github_app_access_token.py

@@ -89,8 +89,9 @@ except ImportError:
 
 import time
 import json
+from urllib.error import HTTPError
+
 from ansible.module_utils.urls import open_url
-from ansible.module_utils.six.moves.urllib.error import HTTPError
 from ansible.errors import AnsibleError, AnsibleOptionsError
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.display import Display

plugins/lookup/onepassword.py

@@ -85,7 +85,6 @@ from ansible.plugins.lookup import LookupBase
 from ansible.errors import AnsibleLookupError, AnsibleOptionsError
 from ansible.module_utils.common.process import get_bin_path
 from ansible.module_utils.common.text.converters import to_bytes, to_text
-from ansible.module_utils.six import with_metaclass
 
 from ansible_collections.community.general.plugins.module_utils.onepassword import OnePasswordConfig
 
@@ -98,7 +97,7 @@ def _lower_if_possible(value):
         return value
 
 
-class OnePassCLIBase(with_metaclass(abc.ABCMeta, object)):
+class OnePassCLIBase(object, metaclass=abc.ABCMeta):
     bin = "op"
 
     def __init__(

plugins/lookup/revbitspss.py

@@ -66,7 +66,6 @@ EXAMPLES = r"""
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.display import Display
 from ansible.errors import AnsibleError
-from ansible.module_utils.six import raise_from
 
 try:
     from pam.revbits_ansible.server import SecretServer
@@ -87,10 +86,7 @@ class LookupModule(LookupBase):
 
     def run(self, terms, variables, **kwargs):
         if ANOTHER_LIBRARY_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('revbits_ansible must be installed to use this plugin'),
-                ANOTHER_LIBRARY_IMPORT_ERROR
-            )
+            raise AnsibleError('revbits_ansible must be installed to use this plugin') from ANOTHER_LIBRARY_IMPORT_ERROR
         self.set_options(var_options=variables, direct=kwargs)
         secret_server = LookupModule.Client(
             {

plugins/lookup/tss.py

@@ -258,7 +258,6 @@ EXAMPLES = r"""
 import abc
 import os
 from ansible.errors import AnsibleError, AnsibleOptionsError
-from ansible.module_utils import six
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.display import Display
 
@@ -289,8 +288,7 @@ except ImportError:
 display = Display()
 
 
-@six.add_metaclass(abc.ABCMeta)
-class TSSClient(object):
+class TSSClient(object, metaclass=abc.ABCMeta):
     def __init__(self):
         self._client = None