diff options
author | Matt Clay <matt@mystile.com> | 2023-05-03 08:58:00 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-03 08:58:00 -0700 |
commit | 2cd1744be3d96f1eec674e1b66433c3730caa24f (patch) | |
tree | 8ab323420af73f978020366daeedd7c9ccd6f246 /lib/ansible/utils | |
parent | eea7137449ba6a94126e97e463682319e030e6fd (diff) | |
download | ansible-2cd1744be3d96f1eec674e1b66433c3730caa24f.tar.gz |
Use ansible.module_utils.common.text.converters (#80704)
Replace use of old `ansible.module_utils._text` and add a unit test to maintain backwards compatibility.
Diffstat (limited to 'lib/ansible/utils')
-rw-r--r-- | lib/ansible/utils/cmd_functions.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/display.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/encrypt.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/hashing.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/jsonrpc.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/path.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/plugin_docs.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/py3compat.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/shlex.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/ssh_functions.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/unicode.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/unsafe_proxy.py | 2 | ||||
-rw-r--r-- | lib/ansible/utils/vars.py | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/lib/ansible/utils/cmd_functions.py b/lib/ansible/utils/cmd_functions.py index d4edb2f45f..436d955b31 100644 --- a/lib/ansible/utils/cmd_functions.py +++ b/lib/ansible/utils/cmd_functions.py @@ -24,7 +24,7 @@ import shlex import subprocess import sys -from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.text.converters import to_bytes def run_cmd(cmd, live=False, readsize=10): diff --git a/lib/ansible/utils/display.py b/lib/ansible/utils/display.py index 7f059a16a6..2311120897 100644 --- a/lib/ansible/utils/display.py +++ b/lib/ansible/utils/display.py @@ -48,7 +48,7 @@ from struct import unpack, pack from ansible import constants as C from ansible.errors import AnsibleError, AnsibleAssertionError, AnsiblePromptInterrupt, AnsiblePromptNoninteractive -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.six import text_type from ansible.utils.color import stringc from ansible.utils.multiprocessing import context as multiprocessing_context diff --git a/lib/ansible/utils/encrypt.py b/lib/ansible/utils/encrypt.py index 661fde3407..04ae8dff91 100644 --- a/lib/ansible/utils/encrypt.py +++ b/lib/ansible/utils/encrypt.py @@ -15,7 +15,7 @@ from collections import namedtuple from ansible import constants as C from ansible.errors import AnsibleError, AnsibleAssertionError from ansible.module_utils.six import text_type -from ansible.module_utils._text import to_text, to_bytes +from ansible.module_utils.common.text.converters import to_text, to_bytes from ansible.utils.display import Display PASSLIB_E = CRYPT_E = None diff --git a/lib/ansible/utils/hashing.py b/lib/ansible/utils/hashing.py index 71300d6192..97ea1dc13c 100644 --- a/lib/ansible/utils/hashing.py +++ b/lib/ansible/utils/hashing.py @@ -30,7 +30,7 @@ except ImportError: _md5 = None from ansible.errors import AnsibleError -from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.text.converters import to_bytes def secure_hash_s(data, hash_func=sha1): diff --git a/lib/ansible/utils/jsonrpc.py b/lib/ansible/utils/jsonrpc.py index 8d5b0f6c9e..2af8bd3581 100644 --- a/lib/ansible/utils/jsonrpc.py +++ b/lib/ansible/utils/jsonrpc.py @@ -8,7 +8,7 @@ import json import pickle import traceback -from ansible.module_utils._text import to_text +from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.connection import ConnectionError from ansible.module_utils.six import binary_type, text_type from ansible.utils.display import Display diff --git a/lib/ansible/utils/path.py b/lib/ansible/utils/path.py index f876addf1a..e4e00ce76f 100644 --- a/lib/ansible/utils/path.py +++ b/lib/ansible/utils/path.py @@ -22,7 +22,7 @@ import shutil from errno import EEXIST from ansible.errors import AnsibleError -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 __all__ = ['unfrackpath', 'makedirs_safe'] diff --git a/lib/ansible/utils/plugin_docs.py b/lib/ansible/utils/plugin_docs.py index 3af26789b3..91b37228a8 100644 --- a/lib/ansible/utils/plugin_docs.py +++ b/lib/ansible/utils/plugin_docs.py @@ -11,7 +11,7 @@ from ansible import constants as C from ansible.release import __version__ as ansible_version from ansible.errors import AnsibleError, AnsibleParserError, AnsiblePluginNotFound from ansible.module_utils.six import string_types -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.parsing.plugin_docs import read_docstring from ansible.parsing.yaml.loader import AnsibleLoader from ansible.utils.display import Display diff --git a/lib/ansible/utils/py3compat.py b/lib/ansible/utils/py3compat.py index 88d9fdff50..52011322ad 100644 --- a/lib/ansible/utils/py3compat.py +++ b/lib/ansible/utils/py3compat.py @@ -17,7 +17,7 @@ import sys from collections.abc import MutableMapping from ansible.module_utils.six import PY3 -from ansible.module_utils._text import to_bytes, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_text __all__ = ('environ',) diff --git a/lib/ansible/utils/shlex.py b/lib/ansible/utils/shlex.py index 5e82021bd5..db78d3d5f7 100644 --- a/lib/ansible/utils/shlex.py +++ b/lib/ansible/utils/shlex.py @@ -21,7 +21,7 @@ __metaclass__ = type import shlex from ansible.module_utils.six import PY3 -from ansible.module_utils._text import to_bytes, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_text if PY3: diff --git a/lib/ansible/utils/ssh_functions.py b/lib/ansible/utils/ssh_functions.py index a728889ad8..e1b6566851 100644 --- a/lib/ansible/utils/ssh_functions.py +++ b/lib/ansible/utils/ssh_functions.py @@ -23,7 +23,7 @@ __metaclass__ = type import subprocess from ansible import constants as C -from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils.compat.paramiko import paramiko diff --git a/lib/ansible/utils/unicode.py b/lib/ansible/utils/unicode.py index 1218a6e706..b5304ba8a1 100644 --- a/lib/ansible/utils/unicode.py +++ b/lib/ansible/utils/unicode.py @@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from ansible.module_utils._text import to_text +from ansible.module_utils.common.text.converters import to_text __all__ = ('unicode_wrap',) diff --git a/lib/ansible/utils/unsafe_proxy.py b/lib/ansible/utils/unsafe_proxy.py index d7c07730ef..b0443a6dfe 100644 --- a/lib/ansible/utils/unsafe_proxy.py +++ b/lib/ansible/utils/unsafe_proxy.py @@ -55,7 +55,7 @@ __metaclass__ = type from collections.abc import Mapping, Set -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.common.collections import is_sequence from ansible.module_utils.six import binary_type, text_type from ansible.utils.native_jinja import NativeJinjaText diff --git a/lib/ansible/utils/vars.py b/lib/ansible/utils/vars.py index 5a1e729cc2..889f5943ae 100644 --- a/lib/ansible/utils/vars.py +++ b/lib/ansible/utils/vars.py @@ -30,7 +30,7 @@ from ansible import constants as C from ansible import context from ansible.errors import AnsibleError, AnsibleOptionsError from ansible.module_utils.six import string_types, PY3 -from ansible.module_utils._text import to_native, to_text +from ansible.module_utils.common.text.converters import to_native, to_text from ansible.parsing.splitter import parse_kv |