diff options
Diffstat (limited to 'lib/ansible/playbook')
-rw-r--r-- | lib/ansible/playbook/__init__.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/base.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/conditional.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/helpers.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/included_file.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/play.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/playbook_include.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/role/__init__.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/role/include.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/role/metadata.py | 2 | ||||
-rw-r--r-- | lib/ansible/playbook/task.py | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/lib/ansible/playbook/__init__.py b/lib/ansible/playbook/__init__.py index 0ab2271920..52b2ee7f36 100644 --- a/lib/ansible/playbook/__init__.py +++ b/lib/ansible/playbook/__init__.py @@ -23,7 +23,7 @@ import os from ansible import constants as C from ansible.errors import AnsibleParserError -from ansible.module_utils._text import to_text, to_native +from ansible.module_utils.common.text.converters import to_text, to_native from ansible.playbook.play import Play from ansible.playbook.playbook_include import PlaybookInclude from ansible.plugins.loader import add_all_plugin_dirs diff --git a/lib/ansible/playbook/base.py b/lib/ansible/playbook/base.py index 94f8a155d4..c7d13b2da6 100644 --- a/lib/ansible/playbook/base.py +++ b/lib/ansible/playbook/base.py @@ -19,7 +19,7 @@ from ansible import context from ansible.errors import AnsibleError, AnsibleParserError, AnsibleUndefinedVariable, AnsibleAssertionError from ansible.module_utils.six import string_types from ansible.module_utils.parsing.convert_bool import boolean -from ansible.module_utils._text import to_text, to_native +from ansible.module_utils.common.text.converters import to_text, to_native from ansible.parsing.dataloader import DataLoader from ansible.playbook.attribute import Attribute, FieldAttribute, ConnectionFieldAttribute, NonInheritableFieldAttribute from ansible.plugins.loader import module_loader, action_loader diff --git a/lib/ansible/playbook/conditional.py b/lib/ansible/playbook/conditional.py index 834725bf83..6b685ef6a8 100644 --- a/lib/ansible/playbook/conditional.py +++ b/lib/ansible/playbook/conditional.py @@ -27,7 +27,7 @@ from jinja2.exceptions import UndefinedError from ansible.errors import AnsibleError, AnsibleUndefinedVariable from ansible.module_utils.six import text_type -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.playbook.attribute import FieldAttribute from ansible.template import Templar from ansible.utils.display import Display diff --git a/lib/ansible/playbook/helpers.py b/lib/ansible/playbook/helpers.py index 46fe46a111..1c44448a5f 100644 --- a/lib/ansible/playbook/helpers.py +++ b/lib/ansible/playbook/helpers.py @@ -22,7 +22,7 @@ import os from ansible import constants as C from ansible.errors import AnsibleParserError, AnsibleUndefinedVariable, AnsibleAssertionError -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.parsing.mod_args import ModuleArgsParser from ansible.utils.display import Display diff --git a/lib/ansible/playbook/included_file.py b/lib/ansible/playbook/included_file.py index b833077c95..c1e815b1ad 100644 --- a/lib/ansible/playbook/included_file.py +++ b/lib/ansible/playbook/included_file.py @@ -24,7 +24,7 @@ import os from ansible import constants as C from ansible.errors import AnsibleError from ansible.executor.task_executor import remove_omit -from ansible.module_utils._text import to_text +from ansible.module_utils.common.text.converters import to_text from ansible.playbook.handler import Handler from ansible.playbook.task_include import TaskInclude from ansible.playbook.role_include import IncludeRole diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index e0f8b639a6..6449859659 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -22,7 +22,7 @@ __metaclass__ = type from ansible import constants as C from ansible import context from ansible.errors import AnsibleParserError, AnsibleAssertionError -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.common.collections import is_sequence from ansible.module_utils.six import binary_type, string_types, text_type from ansible.playbook.attribute import NonInheritableFieldAttribute diff --git a/lib/ansible/playbook/playbook_include.py b/lib/ansible/playbook/playbook_include.py index f0b792e067..02837dde74 100644 --- a/lib/ansible/playbook/playbook_include.py +++ b/lib/ansible/playbook/playbook_include.py @@ -23,7 +23,7 @@ import os import ansible.constants as C from ansible.errors import AnsibleParserError, AnsibleAssertionError -from ansible.module_utils._text import to_bytes +from ansible.module_utils.common.text.converters import to_bytes from ansible.module_utils.six import string_types from ansible.parsing.splitter import split_args from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleMapping diff --git a/lib/ansible/playbook/role/__init__.py b/lib/ansible/playbook/role/__init__.py index b35519e4ca..31e6309729 100644 --- a/lib/ansible/playbook/role/__init__.py +++ b/lib/ansible/playbook/role/__init__.py @@ -26,7 +26,7 @@ from types import MappingProxyType from ansible import constants as C from ansible.errors import AnsibleError, AnsibleParserError, AnsibleAssertionError -from ansible.module_utils._text import to_text +from ansible.module_utils.common.text.converters import to_text from ansible.module_utils.six import binary_type, text_type from ansible.playbook.attribute import FieldAttribute from ansible.playbook.base import Base diff --git a/lib/ansible/playbook/role/include.py b/lib/ansible/playbook/role/include.py index 91f405162a..f4b3e40291 100644 --- a/lib/ansible/playbook/role/include.py +++ b/lib/ansible/playbook/role/include.py @@ -24,7 +24,7 @@ from ansible.module_utils.six import string_types from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject from ansible.playbook.delegatable import Delegatable from ansible.playbook.role.definition import RoleDefinition -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native __all__ = ['RoleInclude'] diff --git a/lib/ansible/playbook/role/metadata.py b/lib/ansible/playbook/role/metadata.py index 8366a630a2..e299122e9a 100644 --- a/lib/ansible/playbook/role/metadata.py +++ b/lib/ansible/playbook/role/metadata.py @@ -22,7 +22,7 @@ __metaclass__ = type import os from ansible.errors import AnsibleParserError, AnsibleError -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.six import string_types from ansible.playbook.attribute import NonInheritableFieldAttribute from ansible.playbook.base import Base diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py index ee04a54f52..599abf2b9d 100644 --- a/lib/ansible/playbook/task.py +++ b/lib/ansible/playbook/task.py @@ -21,7 +21,7 @@ __metaclass__ = type from ansible import constants as C from ansible.errors import AnsibleError, AnsibleParserError, AnsibleUndefinedVariable, AnsibleAssertionError -from ansible.module_utils._text import to_native +from ansible.module_utils.common.text.converters import to_native from ansible.module_utils.six import string_types from ansible.parsing.mod_args import ModuleArgsParser from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject, AnsibleMapping |