diff options
Diffstat (limited to 'lib/ansible/modules')
36 files changed, 36 insertions, 36 deletions
diff --git a/lib/ansible/modules/apt.py b/lib/ansible/modules/apt.py index 9c62ecd553..ad073e8681 100644 --- a/lib/ansible/modules/apt.py +++ b/lib/ansible/modules/apt.py @@ -365,7 +365,7 @@ import time from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.locale import get_best_parsable_locale from ansible.module_utils.common.respawn import has_respawned, probe_interpreters_for_module, respawn_module -from ansible.module_utils._text import to_native, to_text +from ansible.module_utils.common.text.converters import to_native, to_text from ansible.module_utils.six import PY3, string_types from ansible.module_utils.urls import fetch_file diff --git a/lib/ansible/modules/apt_key.py b/lib/ansible/modules/apt_key.py index 94b969030d..cc1582c5b1 100644 --- a/lib/ansible/modules/apt_key.py +++ b/lib/ansible/modules/apt_key.py @@ -171,7 +171,7 @@ import os # FIXME: standardize into module_common from traceback import format_exc -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.locale import get_best_parsable_locale from ansible.module_utils.urls import fetch_url diff --git a/lib/ansible/modules/apt_repository.py b/lib/ansible/modules/apt_repository.py index cbd837417e..5179be91f4 100644 --- a/lib/ansible/modules/apt_repository.py +++ b/lib/ansible/modules/apt_repository.py @@ -180,7 +180,7 @@ import time from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.respawn import has_respawned, probe_interpreters_for_module, respawn_module -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.six import PY3 from ansible.module_utils.urls import fetch_url diff --git a/lib/ansible/modules/assemble.py b/lib/ansible/modules/assemble.py index 2b443ce855..e046c1129c 100644 --- a/lib/ansible/modules/assemble.py +++ b/lib/ansible/modules/assemble.py @@ -133,7 +133,7 @@ import tempfile from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import b, indexbytes -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None, ignore_hidden=False, tmpdir=None): diff --git a/lib/ansible/modules/async_status.py b/lib/ansible/modules/async_status.py index 3609c46078..b133b97a7d 100644 --- a/lib/ansible/modules/async_status.py +++ b/lib/ansible/modules/async_status.py @@ -107,7 +107,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native def main(): diff --git a/lib/ansible/modules/async_wrapper.py b/lib/ansible/modules/async_wrapper.py index 4b1a5b3232..b585396e45 100644 --- a/lib/ansible/modules/async_wrapper.py +++ b/lib/ansible/modules/async_wrapper.py @@ -20,7 +20,7 @@ import time import syslog import multiprocessing -from ansible.module_utils._text import to_text, to_bytes +from ansible.module_utils.common.text.converters import to_text, to_bytes PY3 = sys.version_info[0] == 3 diff --git a/lib/ansible/modules/blockinfile.py b/lib/ansible/modules/blockinfile.py index 63fc021454..7013de97e7 100644 --- a/lib/ansible/modules/blockinfile.py +++ b/lib/ansible/modules/blockinfile.py @@ -179,7 +179,7 @@ import os import tempfile from ansible.module_utils.six import b from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils._text import to_bytes, to_native +from ansible.module_utils.common.text.converters import to_bytes, to_native def write_changes(module, contents, path): diff --git a/lib/ansible/modules/command.py b/lib/ansible/modules/command.py index a8d6bf4ebe..8150ab8792 100644 --- a/lib/ansible/modules/command.py +++ b/lib/ansible/modules/command.py @@ -219,7 +219,7 @@ import os import shlex from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils._text import to_native, to_bytes, to_text +from ansible.module_utils.common.text.converters import to_native, to_bytes, to_text from ansible.module_utils.common.collections import is_iterable diff --git a/lib/ansible/modules/copy.py b/lib/ansible/modules/copy.py index 3517c102c5..26af21c309 100644 --- a/lib/ansible/modules/copy.py +++ b/lib/ansible/modules/copy.py @@ -293,7 +293,7 @@ import stat import tempfile import traceback -from ansible.module_utils._text import to_bytes, to_native +from ansible.module_utils.common.text.converters import to_bytes, to_native from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.locale import get_best_parsable_locale diff --git a/lib/ansible/modules/debconf.py b/lib/ansible/modules/debconf.py index 32f0000c37..1eb5e3f248 100644 --- a/lib/ansible/modules/debconf.py +++ b/lib/ansible/modules/debconf.py @@ -124,7 +124,7 @@ EXAMPLES = r''' RETURN = r'''#''' -from ansible.module_utils._text import to_text +from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/dnf.py b/lib/ansible/modules/dnf.py index 771d85cde4..3bfca3cd71 100644 --- a/lib/ansible/modules/dnf.py +++ b/lib/ansible/modules/dnf.py @@ -383,7 +383,7 @@ import os import re import sys -from ansible.module_utils._text import to_native, to_text +from ansible.module_utils.common.text.converters import to_native, to_text from ansible.module_utils.urls import fetch_file from ansible.module_utils.six import text_type from ansible.module_utils.compat.version import LooseVersion diff --git a/lib/ansible/modules/expect.py b/lib/ansible/modules/expect.py index 9ca799dac7..c9aac71ac5 100644 --- a/lib/ansible/modules/expect.py +++ b/lib/ansible/modules/expect.py @@ -121,7 +121,7 @@ except ImportError: HAS_PEXPECT = False from ansible.module_utils.basic import AnsibleModule, missing_required_lib -from ansible.module_utils._text import to_bytes, to_native +from ansible.module_utils.common.text.converters import to_bytes, to_native def response_closure(module, question, responses): diff --git a/lib/ansible/modules/file.py b/lib/ansible/modules/file.py index 72b510c3ca..0c9c3d9504 100644 --- a/lib/ansible/modules/file.py +++ b/lib/ansible/modules/file.py @@ -237,7 +237,7 @@ from pwd import getpwnam, getpwuid from grp import getgrnam, getgrgid from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils._text import to_bytes, to_native +from ansible.module_utils.common.text.converters import to_bytes, to_native # There will only be a single AnsibleModule object per module diff --git a/lib/ansible/modules/find.py b/lib/ansible/modules/find.py index b13c841cc2..0014a19093 100644 --- a/lib/ansible/modules/find.py +++ b/lib/ansible/modules/find.py @@ -244,7 +244,7 @@ import re import stat import time -from ansible.module_utils._text import to_text, to_native +from ansible.module_utils.common.text.converters import to_text, to_native from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/get_url.py b/lib/ansible/modules/get_url.py index 2d85d4da36..817bca0ae2 100644 --- a/lib/ansible/modules/get_url.py +++ b/lib/ansible/modules/get_url.py @@ -375,7 +375,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six.moves.urllib.parse import urlsplit -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.urls import fetch_url, url_argument_spec # ============================================================== diff --git a/lib/ansible/modules/getent.py b/lib/ansible/modules/getent.py index e823e58eba..ce89f80ef2 100644 --- a/lib/ansible/modules/getent.py +++ b/lib/ansible/modules/getent.py @@ -118,7 +118,7 @@ ansible_facts: import traceback from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native def main(): diff --git a/lib/ansible/modules/git.py b/lib/ansible/modules/git.py index 2ea64fb3a1..7df80cfa5e 100644 --- a/lib/ansible/modules/git.py +++ b/lib/ansible/modules/git.py @@ -338,7 +338,7 @@ import shutil import tempfile from ansible.module_utils.compat.version import LooseVersion -from ansible.module_utils._text import to_native, to_text +from ansible.module_utils.common.text.converters import to_native, to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.locale import get_best_parsable_locale from ansible.module_utils.common.process import get_bin_path diff --git a/lib/ansible/modules/group.py b/lib/ansible/modules/group.py index 4444f158b4..4119d4a06f 100644 --- a/lib/ansible/modules/group.py +++ b/lib/ansible/modules/group.py @@ -117,7 +117,7 @@ system: import grp import os -from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.sys_info import get_platform_subclass diff --git a/lib/ansible/modules/hostname.py b/lib/ansible/modules/hostname.py index f63c16a01d..4a1c7ead66 100644 --- a/lib/ansible/modules/hostname.py +++ b/lib/ansible/modules/hostname.py @@ -81,7 +81,7 @@ from ansible.module_utils.basic import ( from ansible.module_utils.common.sys_info import get_platform_subclass from ansible.module_utils.facts.system.service_mgr import ServiceMgrFactCollector from ansible.module_utils.facts.utils import get_file_lines, get_file_content -from ansible.module_utils._text import to_native, to_text +from ansible.module_utils.common.text.converters import to_native, to_text from ansible.module_utils.six import PY3, text_type STRATS = { diff --git a/lib/ansible/modules/known_hosts.py b/lib/ansible/modules/known_hosts.py index b0c888807c..e1ac5d366a 100644 --- a/lib/ansible/modules/known_hosts.py +++ b/lib/ansible/modules/known_hosts.py @@ -111,7 +111,7 @@ import re import tempfile from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils._text import to_bytes, to_native +from ansible.module_utils.common.text.converters import to_bytes, to_native def enforce_state(module, params): diff --git a/lib/ansible/modules/lineinfile.py b/lib/ansible/modules/lineinfile.py index 0e1b76f5cb..0c3a397ba4 100644 --- a/lib/ansible/modules/lineinfile.py +++ b/lib/ansible/modules/lineinfile.py @@ -255,7 +255,7 @@ import tempfile # import module snippets from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils._text import to_bytes, to_native, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text def write_changes(module, b_lines, dest): diff --git a/lib/ansible/modules/package_facts.py b/lib/ansible/modules/package_facts.py index ea3c699965..b5056f09e1 100644 --- a/lib/ansible/modules/package_facts.py +++ b/lib/ansible/modules/package_facts.py @@ -240,7 +240,7 @@ ansible_facts: import re -from ansible.module_utils._text import to_native, to_text +from ansible.module_utils.common.text.converters import to_native, to_text from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.locale import get_best_parsable_locale from ansible.module_utils.common.process import get_bin_path diff --git a/lib/ansible/modules/pip.py b/lib/ansible/modules/pip.py index a77d2fdabd..c39f7baca0 100644 --- a/lib/ansible/modules/pip.py +++ b/lib/ansible/modules/pip.py @@ -284,7 +284,7 @@ except ImportError: HAS_SETUPTOOLS = False SETUPTOOLS_IMP_ERR = traceback.format_exc() -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.basic import AnsibleModule, is_executable, missing_required_lib from ansible.module_utils.common.locale import get_best_parsable_locale from ansible.module_utils.six import PY3 diff --git a/lib/ansible/modules/replace.py b/lib/ansible/modules/replace.py index d8b192663d..c374783381 100644 --- a/lib/ansible/modules/replace.py +++ b/lib/ansible/modules/replace.py @@ -185,7 +185,7 @@ import re import tempfile from traceback import format_exc -from ansible.module_utils._text import to_text, to_bytes +from ansible.module_utils.common.text.converters import to_text, to_bytes from ansible.module_utils.basic import AnsibleModule diff --git a/lib/ansible/modules/rpm_key.py b/lib/ansible/modules/rpm_key.py index f420eec561..2586076a77 100644 --- a/lib/ansible/modules/rpm_key.py +++ b/lib/ansible/modules/rpm_key.py @@ -85,7 +85,7 @@ import tempfile # import module snippets from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.urls import fetch_url -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native def is_pubkey(string): diff --git a/lib/ansible/modules/service.py b/lib/ansible/modules/service.py index 49294c17fd..81d2299c7b 100644 --- a/lib/ansible/modules/service.py +++ b/lib/ansible/modules/service.py @@ -172,7 +172,7 @@ import time if platform.system() != 'SunOS': from ansible.module_utils.compat.version import LooseVersion -from ansible.module_utils._text import to_bytes, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.locale import get_best_parsable_locale from ansible.module_utils.common.sys_info import get_platform_subclass diff --git a/lib/ansible/modules/setup.py b/lib/ansible/modules/setup.py index df2a67f236..ac139a94ca 100644 --- a/lib/ansible/modules/setup.py +++ b/lib/ansible/modules/setup.py @@ -174,7 +174,7 @@ EXAMPLES = r""" # import module snippets from ..module_utils.basic import AnsibleModule -from ansible.module_utils._text import to_text +from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.facts import ansible_collector, default_collectors from ansible.module_utils.facts.collector import CollectorNotFoundError, CycleFoundInFactDeps, UnresolvedFactDep from ansible.module_utils.facts.namespace import PrefixFactNamespace diff --git a/lib/ansible/modules/stat.py b/lib/ansible/modules/stat.py index 45ca78b2a7..221d08bae2 100644 --- a/lib/ansible/modules/stat.py +++ b/lib/ansible/modules/stat.py @@ -384,7 +384,7 @@ import stat # import module snippets from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.text.converters import to_bytes def format_output(module, path, st): diff --git a/lib/ansible/modules/systemd_service.py b/lib/ansible/modules/systemd_service.py index d142f865b5..866186f1be 100644 --- a/lib/ansible/modules/systemd_service.py +++ b/lib/ansible/modules/systemd_service.py @@ -282,7 +282,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.facts.system.chroot import is_chroot from ansible.module_utils.service import sysv_exists, sysv_is_enabled, fail_if_missing -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native def is_running_service(service_status): diff --git a/lib/ansible/modules/tempfile.py b/lib/ansible/modules/tempfile.py index 10594dec0d..60ee4b4b56 100644 --- a/lib/ansible/modules/tempfile.py +++ b/lib/ansible/modules/tempfile.py @@ -87,7 +87,7 @@ from tempfile import mkstemp, mkdtemp from traceback import format_exc from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native def main(): diff --git a/lib/ansible/modules/unarchive.py b/lib/ansible/modules/unarchive.py index bb081ffbb1..3bb6b834cf 100644 --- a/lib/ansible/modules/unarchive.py +++ b/lib/ansible/modules/unarchive.py @@ -255,7 +255,7 @@ import traceback from functools import partial from zipfile import ZipFile -from ansible.module_utils._text import to_bytes, to_native, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.process import get_bin_path from ansible.module_utils.common.locale import get_best_parsable_locale diff --git a/lib/ansible/modules/uri.py b/lib/ansible/modules/uri.py index 03ba66fa87..2764e74554 100644 --- a/lib/ansible/modules/uri.py +++ b/lib/ansible/modules/uri.py @@ -451,7 +451,7 @@ import tempfile from ansible.module_utils.basic import AnsibleModule, sanitize_keys from ansible.module_utils.six import PY2, PY3, binary_type, iteritems, string_types from ansible.module_utils.six.moves.urllib.parse import urlencode, urlsplit -from ansible.module_utils._text import to_native, to_text +from ansible.module_utils.common.text.converters import to_native, to_text from ansible.module_utils.six.moves.collections_abc import Mapping, Sequence from ansible.module_utils.urls import fetch_url, get_response_filename, parse_content_type, prepare_multipart, url_argument_spec diff --git a/lib/ansible/modules/user.py b/lib/ansible/modules/user.py index 0c26cc28bd..dc2a2f6de5 100644 --- a/lib/ansible/modules/user.py +++ b/lib/ansible/modules/user.py @@ -459,7 +459,7 @@ import time import math from ansible.module_utils import distro -from ansible.module_utils._text import to_bytes, to_native, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.locale import get_best_parsable_locale from ansible.module_utils.common.sys_info import get_platform_subclass diff --git a/lib/ansible/modules/wait_for.py b/lib/ansible/modules/wait_for.py index 66666bde66..2abdb1d597 100644 --- a/lib/ansible/modules/wait_for.py +++ b/lib/ansible/modules/wait_for.py @@ -238,7 +238,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule, missing_required_lib from ansible.module_utils.common.sys_info import get_platform_subclass -from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.text.converters import to_bytes HAS_PSUTIL = False diff --git a/lib/ansible/modules/yum.py b/lib/ansible/modules/yum.py index 0f8982b47a..ed54fd700f 100644 --- a/lib/ansible/modules/yum.py +++ b/lib/ansible/modules/yum.py @@ -408,7 +408,7 @@ EXAMPLES = ''' from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.common.locale import get_best_parsable_locale from ansible.module_utils.common.respawn import has_respawned, respawn_module -from ansible.module_utils._text import to_native, to_text +from ansible.module_utils.common.text.converters import to_native, to_text from ansible.module_utils.yumdnf import YumDnf, yumdnf_argument_spec import errno diff --git a/lib/ansible/modules/yum_repository.py b/lib/ansible/modules/yum_repository.py index 84a10b9220..08858e3452 100644 --- a/lib/ansible/modules/yum_repository.py +++ b/lib/ansible/modules/yum_repository.py @@ -438,7 +438,7 @@ import os from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six.moves import configparser -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native class YumRepo(object): |