diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 00:55:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 00:55:42 +0000 |
| commit | 62d9962ec7d01c95bf5732169320d3857a41446e (patch) | |
| tree | f60d8fc63ff738e5f5afec48a84cf41480ee1315 /lib/ansible/plugins/callback | |
| parent | Releasing progress-linux version 2.14.13-1~progress7.99u1. (diff) | |
| download | ansible-core-62d9962ec7d01c95bf5732169320d3857a41446e.tar.xz ansible-core-62d9962ec7d01c95bf5732169320d3857a41446e.zip | |
Merging upstream version 2.16.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/ansible/plugins/callback')
| -rw-r--r-- | lib/ansible/plugins/callback/__init__.py | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/callback/junit.py | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/callback/oneline.py | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/callback/tree.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/ansible/plugins/callback/__init__.py b/lib/ansible/plugins/callback/__init__.py index 7646d29..4346958 100644 --- a/lib/ansible/plugins/callback/__init__.py +++ b/lib/ansible/plugins/callback/__init__.py @@ -165,7 +165,7 @@ class CallbackBase(AnsiblePlugin): self._hide_in_debug = ('changed', 'failed', 'skipped', 'invocation', 'skip_reason') - ''' helper for callbacks, so they don't all have to include deepcopy ''' + # helper for callbacks, so they don't all have to include deepcopy _copy_result = deepcopy def set_option(self, k, v): diff --git a/lib/ansible/plugins/callback/junit.py b/lib/ansible/plugins/callback/junit.py index 75cdbc7..92158ef 100644 --- a/lib/ansible/plugins/callback/junit.py +++ b/lib/ansible/plugins/callback/junit.py @@ -88,7 +88,7 @@ import time import re from ansible import constants as C -from ansible.module_utils._text import to_bytes, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_text from ansible.plugins.callback import CallbackBase from ansible.utils._junit_xml import ( TestCase, diff --git a/lib/ansible/plugins/callback/oneline.py b/lib/ansible/plugins/callback/oneline.py index fd51b27..556f21c 100644 --- a/lib/ansible/plugins/callback/oneline.py +++ b/lib/ansible/plugins/callback/oneline.py @@ -12,7 +12,7 @@ DOCUMENTATION = ''' short_description: oneline Ansible screen output version_added: historical description: - - This is the output callback used by the -o/--one-line command line option. + - This is the output callback used by the C(-o)/C(--one-line) command line option. ''' from ansible.plugins.callback import CallbackBase diff --git a/lib/ansible/plugins/callback/tree.py b/lib/ansible/plugins/callback/tree.py index a9f65d2..52a5fee 100644 --- a/lib/ansible/plugins/callback/tree.py +++ b/lib/ansible/plugins/callback/tree.py @@ -31,7 +31,7 @@ DOCUMENTATION = ''' import os from ansible.constants import TREE_DIR -from ansible.module_utils._text import to_bytes, to_text +from ansible.module_utils.common.text.converters import to_bytes, to_text from ansible.plugins.callback import CallbackBase from ansible.utils.path import makedirs_safe, unfrackpath |