mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-07-29 19:04:42 +00:00
Use ansible.module_utils.six instead of six
This patch is needed to pass Automation Hub tests.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user