Use ansible.module_utils.six instead of six

This patch is needed to pass Automation Hub tests.

plugins/module_utils/ansible_freeipa_module.py

@@ -103,7 +103,7 @@ else:
 
     import socket
     import base64
-    import six
+    from ansible.module_utils import six
 
     try:
         from collections.abc import Mapping  # noqa

plugins/modules/ipadnsrecord.py

@@ -869,8 +869,7 @@ from ansible.module_utils.ansible_freeipa_module import \
 import dns.reversename
 import dns.resolver
 
-import six
-
+from ansible.module_utils import six
 
 if six.PY3:
     unicode = str

plugins/modules/ipadnszone.py

@@ -210,7 +210,7 @@ from ansible.module_utils.ansible_freeipa_module import (
     ipalib_errors
 )  # noqa: E402
 import netaddr
-import six
+from ansible.module_utils import six
 
 
 if six.PY3:

plugins/modules/ipahost.py

@@ -406,7 +406,7 @@ host:
 from ansible.module_utils.ansible_freeipa_module import \
     IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, \
     encode_certificate, is_ipv4_addr, is_ipv6_addr, ipalib_errors
-import six
+from ansible.module_utils import six
 if six.PY3:
     unicode = str
 

plugins/modules/ipaprivilege.py

@@ -113,7 +113,7 @@ RETURN = """
 from ansible.module_utils.ansible_freeipa_module import \
     IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, gen_add_list, \
     gen_intersection_list
-import six
+from ansible.module_utils import six
 
 if six.PY3:
     unicode = str

plugins/modules/iparole.py

@@ -104,7 +104,7 @@ EXAMPLES = """
 from ansible.module_utils._text import to_text
 from ansible.module_utils.ansible_freeipa_module import \
     IPAAnsibleModule, gen_add_del_lists, compare_args_ipa
-import six
+from ansible.module_utils import six
 
 
 if six.PY3:

plugins/modules/ipauser.py

@@ -475,7 +475,7 @@ user:
 from ansible.module_utils.ansible_freeipa_module import \
     IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, date_format, \
     encode_certificate, load_cert_from_str, DN_x500_text, to_text
-import six
+from ansible.module_utils import six
 if six.PY3:
     unicode = str
 

roles/ipaclient/library/ipaclient_get_facts.py

@@ -15,9 +15,9 @@ author:
 
 import os
 import re
-import six
+from ansible.module_utils import six
 try:
-    from six.moves.configparser import RawConfigParser
+    from ansible.module_utils.six.moves.configparser import RawConfigParser
 except ImportError:
     from ConfigParser import RawConfigParser
 

roles/ipaclient/library/ipaclient_get_otp.py

@@ -124,9 +124,9 @@ host:
 '''
 
 import os
-import six
 
 from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils import six
 
 from ipalib import api, errors
 from ipaplatform.paths import paths

roles/ipaclient/library/ipaclient_test.py

@@ -200,7 +200,7 @@ import socket
 import inspect
 
 try:
-    from six.moves.configparser import RawConfigParser
+    from ansible.module_utils.six.moves.configparser import RawConfigParser
 except ImportError:
     from ConfigParser import RawConfigParser
 

roles/ipareplica/library/ipareplica_add_to_ipaservers.py

@@ -64,7 +64,6 @@ RETURN = '''
 '''
 
 import os
-import six
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.ansible_ipa_replica import (
@@ -73,6 +72,8 @@ from ansible.module_utils.ansible_ipa_replica import (
     gen_remote_api, api
 )
 
+from ansible.module_utils import six
+
 if six.PY3:
     unicode = str
 

roles/ipareplica/library/ipareplica_prepare.py

@@ -195,7 +195,6 @@ RETURN = '''
 import os
 import tempfile
 import traceback
-import six
 from shutil import copyfile
 
 from ansible.module_utils.basic import AnsibleModule
@@ -210,6 +209,7 @@ from ansible.module_utils.ansible_ipa_replica import (
     dns, no_matching_interface_for_ip_address_warning, adtrust,
     constants, api, redirect_stdout, replica_conn_check, tasks
 )
+from ansible.module_utils import six
 
 if six.PY3:
     unicode = str

roles/ipaserver/library/ipaserver_test.py

@@ -212,7 +212,6 @@ RETURN = '''
 
 import os
 import sys
-import six
 import inspect
 import random
 from shutil import copyfile
@@ -229,6 +228,7 @@ from ansible.module_utils.ansible_ipa_server import (
     validate_domain_name, load_pkcs12, IPA_PYTHON_VERSION,
     encode_certificate, check_available_memory
 )
+from ansible.module_utils import six
 
 if six.PY3:
     unicode = str

roles/ipaserver/module_utils/ansible_ipa_server.py

@@ -55,7 +55,7 @@ else:
 
     import logging
     from contextlib import contextmanager as contextlib_contextmanager
-    import six
+    from ansible.module_utils import six
     import base64
 
     from ipapython.version import NUM_VERSION, VERSION

utils/templates/ipamodule+member.py.in

@@ -103,8 +103,7 @@ RETURN = """
 from ansible.module_utils.ansible_freeipa_module import \
     IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, gen_add_list, \
     gen_intersection_list
-
-import six
+from ansible.module_utils import six
 
 if six.PY3:
     unicode = str

utils/templates/ipamodule.py.in

@@ -82,7 +82,7 @@ RETURN = """
 
 from ansible.module_utils.ansible_freeipa_module import \
     IPAAnsibleModule, compare_args_ipa
-import six
+from ansible.module_utils import six
 
 if six.PY3:
     unicode = str