Remove ansible-core 2.20 deprecated imports

This commit removes all dependencies on the 'asible.module_util.six'
module and fixes deprecated imports as defined by the ansible-core
release version 2.20.

This changes render ansible-freeipa collection incompatible with
Python 2.

Changes include:

* Remove six module imports from all modules and roles
  - Removed 'from ansible.module_utils import six' statements
  - Removed 'from ansible.module_utils.six.moves' imports

* Replace and remove Python version checks (six.PY3 and six.PY2)

* Replace unicode usage with to_text or str

* Ensure text conversion routines imports are consistent and are
  imported from Ansible common.text.converters

* Update standard library imports
  - Changed 'six.moves.urllib.parse' to 'urllib.parse'
  - Changed 'six.moves.configparser' to 'ConfigParser'
  - Import 'Mapping' from 'collections.abc'

* Remove Python 2 specific code

Signed-off-by: Rafael Guterres Jeffman <rjeffman@redhat.com>

Author: rjeffman

CONTRIBUTING.md

@@ -87,8 +87,8 @@ configured trust to an AD domain). For these cases, there are some `facts`
 available that will only enable the tests if the testing environment is
 enabled.
 
-The tests run automatically on every pull request, using Fedora, CentOS 7,
-and CentOS 8 environments.
+The tests run automatically on every pull request, using Fedora, and CentOS
+supported environments.
 
 See the document [Running the tests] and also the section `Preparing the
 development environment`, to prepare your environment.

README-host.md

@@ -58,7 +58,7 @@ Example playbook to ensure host presence:
       ip_address: 192.168.0.123
       locality: Lab
       ns_host_location: Lab
-      ns_os_version: CentOS 7
+      ns_os_version: CentOS Stream 10
       ns_hardware_platform: Lenovo T61
       mac_address:
       - "08:00:27:E3:B1:2D"
@@ -89,7 +89,7 @@ Example playbook to ensure host presence with several IP addresses:
       - fe80::20c:29ff:fe02:a1b4
       locality: Lab
       ns_host_location: Lab
-      ns_os_version: CentOS 7
+      ns_os_version: CentOS Stream 10
       ns_hardware_platform: Lenovo T61
       mac_address:
       - "08:00:27:E3:B1:2D"

README.md

@@ -67,7 +67,8 @@ The client role supports versions 4.4 and up, the server role is working with ve
 Supported Distributions
 -----------------------
 
-* RHEL/CentOS 7.4+
+* RHEL 8/9/10
+* CentOS Stream 8+
 * Fedora 40+
 * Ubuntu
 * Debian 10+ (ipaclient only, no server or replica!)

plugins/inventory/freeipa.py

@@ -104,7 +104,7 @@
 from ansible.errors import AnsibleParserError
 from ansible.module_utils.common.text.converters import to_native
 from ansible.plugins.inventory import BaseInventoryPlugin
-from ansible.module_utils.six.moves.urllib.parse import quote
+from urllib.parse import quote
 
 
 class InventoryModule(BaseInventoryPlugin):  # pylint: disable=R0901

plugins/module_utils/ansible_freeipa_module.py

@@ -59,11 +59,9 @@
 import time
 from datetime import datetime
 from contextlib import contextmanager
+from collections.abc import Mapping
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils._text import to_text
-from ansible.module_utils.common.text.converters import jsonify
-from ansible.module_utils import six
-from ansible.module_utils.common._collections_compat import Mapping
+from ansible.module_utils.common.text.converters import jsonify, to_text
 from ansible.module_utils.parsing.convert_bool import boolean
 
 # Import getargspec from inspect or provide own getargspec for
@@ -165,11 +163,7 @@ def is_ipa_configured():
     except ImportError:
         _dcerpc_bindings_installed = False  # pylint: disable=invalid-name
 
-    try:
-        from urllib.parse import urlparse
-    except ImportError:
-        from ansible.module_utils.six.moves.urllib.parse import urlparse
-
+    from urllib.parse import urlparse
     from ipalib.util import normalize_sshpubkey
 
 except ImportError as _err:
@@ -187,10 +181,6 @@ def is_ipa_configured():
     ANSIBLE_FREEIPA_MODULE_IMPORT_ERROR = None
 
 
-if six.PY3:
-    unicode = str
-
-
 def valid_creds(module, principal):  # noqa
     """Get valid credentials matching the princial, try GSSAPI first."""
     if "KRB5CCNAME" in os.environ:
@@ -508,10 +498,7 @@ def module_params_get(module, name, allow_empty_list_item=False):
     # Ansible issue https://github.com/ansible/ansible/issues/77108
     if isinstance(value, list):
         for val in value:
-            if (
-                isinstance(val, (str, unicode))  # pylint: disable=W0012,E0606
-                and not val
-            ):
+            if isinstance(val, str) and not val:
                 if not allow_empty_list_item:
                     module.fail_json(
                         msg="Parameter '%s' contains an empty string" %
@@ -532,7 +519,7 @@ def module_params_get_lowercase(module, name, allow_empty_list_item=False):
 def convert_param_value_to_lowercase(value):
     if isinstance(value, list):
         value = [v.lower() for v in value]
-    if isinstance(value, (str, unicode)):
+    if isinstance(value, str):
         value = value.lower()
     return value
 
@@ -673,12 +660,11 @@ def encode_certificate(cert):
     It also takes FreeIPA and Python versions into account.
     This is used to convert the certificates returned by find and show.
     """
-    if isinstance(cert, (str, unicode, bytes)):
+    if isinstance(cert, (str, bytes)):
         encoded = base64.b64encode(cert)
     else:
         encoded = base64.b64encode(cert.public_bytes(Encoding.DER))
-    if not six.PY2:
-        encoded = encoded.decode('ascii')
+    encoded = encoded.decode('ascii')
     return encoded
 
 
@@ -795,9 +781,9 @@ def _normalize_principal_name(name, realm):
 
         if len(princ.components) == 1 and \
            not princ.components[0].endswith('$'):
-            nprinc = 'host/' + unicode(princ)
+            nprinc = 'host/' + str(princ)
         else:
-            nprinc = unicode(princ)
+            nprinc = str(princ)
         return nprinc
 
     def _check_exists(module, _type, name):
@@ -829,7 +815,7 @@ def _check_exists(module, _type, name):
             nprinc = _normalize_principal_name(princ, realm)
         except ipalib_errors.ValidationError as err:
             module.fail_json(msg="%s: %s" % (_princ, str(err)))
-        princ = unicode(nprinc)
+        princ = str(nprinc)
 
         # Check that host principal exists
         if princ.startswith("host/"):
@@ -908,20 +894,20 @@ def get_trusted_domain_sid_from_name(dom_name):
     """
     Given a trust domain name, returns the domain SID.
 
-    Returns unicode string representation for a given trusted domain name
+    Returns string representation for a given trusted domain name
     or None if SID for the given trusted domain name could not be found.
     """
     domain_validator = __get_domain_validator()
     sid = domain_validator.get_sid_from_domain_name(dom_name)
 
-    return unicode(sid) if sid is not None else None
+    return str(sid) if sid is not None else None
 
 
 def get_trusted_domain_object_sid(object_name):
     """Given an object name, returns de object SID."""
     domain_validator = __get_domain_validator()
     sid = domain_validator.get_trusted_domain_object_sid(object_name)
-    return unicode(sid) if sid is not None else None
+    return str(sid) if sid is not None else None
 
 
 class IPAParamMapping(Mapping):

plugins/modules/ipacert.py

@@ -243,15 +243,10 @@
 import time
 import ssl
 
-from ansible.module_utils import six
-from ansible.module_utils._text import to_text
 from ansible.module_utils.ansible_freeipa_module import (
-    IPAAnsibleModule, certificate_loader, write_certificate_list,
+    IPAAnsibleModule, certificate_loader, write_certificate_list, to_text,
 )
 
-if six.PY3:
-    unicode = str
-
 # Reasons are defined in RFC 5280 sec. 5.3.1; removeFromCRL is not present in
 # this list; run the module with state=released instead.
 REVOCATION_REASONS = {

plugins/modules/ipadnsforwardzone.py

@@ -131,9 +131,8 @@
 '''
 
 
-from ansible.module_utils._text import to_text
 from ansible.module_utils.ansible_freeipa_module import \
-    IPAAnsibleModule, compare_args_ipa
+    IPAAnsibleModule, compare_args_ipa, to_text
 
 
 def find_dnsforwardzone(module, name):

plugins/modules/ipadnsrecord.py

@@ -964,9 +964,8 @@
 """
 
 
-from ansible.module_utils._text import to_text
 from ansible.module_utils.ansible_freeipa_module import \
-    IPAAnsibleModule, is_ipv4_addr, is_ipv6_addr, ipalib_errors
+    IPAAnsibleModule, is_ipv4_addr, is_ipv6_addr, ipalib_errors, to_text
 try:
     import dns.reversename
     import dns.resolver
@@ -975,10 +974,6 @@
 else:
     MODULE_IMPORT_ERROR = None
 
-from ansible.module_utils import six
-
-if six.PY3:
-    unicode = str
 
 _SUPPORTED_RECORD_TYPES = [
     "A", "AAAA", "A6", "AFSDB", "CERT", "CNAME", "DLV", "DNAME", "DS", "KX",

plugins/modules/ipadnszone.py

@@ -233,11 +233,6 @@
     DNSName,
     netaddr
 )  # noqa: E402
-from ansible.module_utils import six
-
-
-if six.PY3:
-    unicode = str
 
 
 class DNSZoneModule(IPAAnsibleModule):

plugins/modules/ipagroup.py

@@ -327,14 +327,10 @@
 RETURN = """
 """
 
-from ansible.module_utils._text import to_text
 from ansible.module_utils.ansible_freeipa_module import \
     IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, \
     gen_add_list, gen_intersection_list, api_check_param, \
-    convert_to_sid
-from ansible.module_utils import six
-if six.PY3:
-    unicode = str
+    convert_to_sid, to_text
 # Ensuring (adding) several groups with mixed types external, nonposix
 # and posix require to have a fix in IPA:
 # FreeIPA issue: https://pagure.io/freeipa/issue/9349
@@ -675,11 +671,7 @@ def main():
 
                 check_parameters(ansible_module, state, action)
 
-            elif (
-                isinstance(
-                    group_name, (str, unicode)  # pylint: disable=W0012,E0606
-                )
-            ):
+            elif isinstance(group_name, str):
                 name = group_name
             else:
                 ansible_module.fail_json(msg="Group '%s' is not valid" %