From 2e8c2f881fc7a1eb4cf3f618c954ce9c4f4145fb Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 24 Nov 2021 09:58:38 +0100
Subject: [PATCH] Use `ansible.module_utils.six` instead of `six`
This patch is needed to pass Automation Hub tests.
---
plugins/module_utils/ansible_freeipa_module.py | 2 +-
plugins/modules/ipadnsrecord.py | 3 +--
plugins/modules/ipadnszone.py | 2 +-
plugins/modules/ipahost.py | 2 +-
plugins/modules/ipaprivilege.py | 2 +-
plugins/modules/iparole.py | 2 +-
plugins/modules/ipauser.py | 2 +-
roles/ipaclient/library/ipaclient_get_facts.py | 4 ++--
roles/ipaclient/library/ipaclient_get_otp.py | 2 +-
roles/ipaclient/library/ipaclient_test.py | 2 +-
roles/ipareplica/library/ipareplica_add_to_ipaservers.py | 3 ++-
roles/ipareplica/library/ipareplica_prepare.py | 2 +-
roles/ipaserver/library/ipaserver_test.py | 2 +-
roles/ipaserver/module_utils/ansible_ipa_server.py | 2 +-
utils/templates/ipamodule+member.py.in | 3 +--
utils/templates/ipamodule.py.in | 2 +-
16 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py
index 272d6874..de09be1c 100644
--- a/plugins/module_utils/ansible_freeipa_module.py
+++ b/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
diff --git a/plugins/modules/ipadnsrecord.py b/plugins/modules/ipadnsrecord.py
index 52459070..dc728031 100644
--- a/plugins/modules/ipadnsrecord.py
+++ b/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
diff --git a/plugins/modules/ipadnszone.py b/plugins/modules/ipadnszone.py
index 1c18c0ea..f4dbc8ee 100644
--- a/plugins/modules/ipadnszone.py
+++ b/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:
diff --git a/plugins/modules/ipahost.py b/plugins/modules/ipahost.py
index 7800b8c3..e4832583 100644
--- a/plugins/modules/ipahost.py
+++ b/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
diff --git a/plugins/modules/ipaprivilege.py b/plugins/modules/ipaprivilege.py
index b08ae1b2..45abe646 100644
--- a/plugins/modules/ipaprivilege.py
+++ b/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
diff --git a/plugins/modules/iparole.py b/plugins/modules/iparole.py
index 2c712894..912cfc1e 100644
--- a/plugins/modules/iparole.py
+++ b/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:
diff --git a/plugins/modules/ipauser.py b/plugins/modules/ipauser.py
index 887b5c57..b737f749 100644
--- a/plugins/modules/ipauser.py
+++ b/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
diff --git a/roles/ipaclient/library/ipaclient_get_facts.py b/roles/ipaclient/library/ipaclient_get_facts.py
index e6f9341f..1a2b331c 100644
--- a/roles/ipaclient/library/ipaclient_get_facts.py
+++ b/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
diff --git a/roles/ipaclient/library/ipaclient_get_otp.py b/roles/ipaclient/library/ipaclient_get_otp.py
index 121aeae9..1ae05ea8 100644
--- a/roles/ipaclient/library/ipaclient_get_otp.py
+++ b/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
diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py
index 6677d837..540daba4 100644
--- a/roles/ipaclient/library/ipaclient_test.py
+++ b/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
diff --git a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
index e39ebc2f..2ec634cc 100644
--- a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
+++ b/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
diff --git a/roles/ipareplica/library/ipareplica_prepare.py b/roles/ipareplica/library/ipareplica_prepare.py
index ae7f5cdf..a78629d2 100644
--- a/roles/ipareplica/library/ipareplica_prepare.py
+++ b/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
diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py
index 4e2df5ca..4c7df49b 100644
--- a/roles/ipaserver/library/ipaserver_test.py
+++ b/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
diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py
index 2cd677fc..dfb424a8 100644
--- a/roles/ipaserver/module_utils/ansible_ipa_server.py
+++ b/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
diff --git a/utils/templates/ipamodule+member.py.in b/utils/templates/ipamodule+member.py.in
index 57b192c5..1515ccc1 100644
--- a/utils/templates/ipamodule+member.py.in
+++ b/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
diff --git a/utils/templates/ipamodule.py.in b/utils/templates/ipamodule.py.in
index ee942cd6..00750f83 100644
--- a/utils/templates/ipamodule.py.in
+++ b/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
--
GitLab