ansible-core 2.19.0b5__py3-none-any.whl → 2.19.0b7__py3-none-any.whl

ansible/plugins/callback/__init__.py

@@ -19,6 +19,7 @@ from __future__ import annotations
 
 import difflib
 import functools
+import inspect
 import json
 import re
 import sys
@@ -39,6 +40,7 @@ from ansible.utils.display import Display
 from ansible.vars.clean import strip_internal_keys, module_response_deepcopy
 from ansible.module_utils._internal._json._profiles import _fallback_to_str
 from ansible._internal._templating import _engine
+from ansible.module_utils._internal import _deprecator
 
 import yaml
 
@@ -61,16 +63,6 @@ _SPACE_BREAK_RE = re.compile(fr' +([{_YAML_BREAK_CHARS}])')
 _T_callable = t.TypeVar("_T_callable", bound=t.Callable)
 
 
-def _callback_base_impl(wrapped: _T_callable) -> _T_callable:
-    """
-    Decorator for the no-op methods on the `CallbackBase` base class.
-    Used to avoid unnecessary dispatch overhead to no-op base callback methods.
-    """
-    wrapped._base_impl = True
-
-    return wrapped
-
-
 class _AnsibleCallbackDumper(_dumper.AnsibleDumper):
     def __init__(self, *args, lossy: bool = False, **kwargs):
         super().__init__(*args, **kwargs)
@@ -154,6 +146,9 @@ class CallbackBase(AnsiblePlugin):
     custom actions.
     """
 
+    _implemented_callback_methods: frozenset[str] = frozenset()
+    """Set of callback methods overridden by each subclass; used by TQM to bypass callback dispatch on no-op methods."""
+
     def __init__(self, display: Display | None = None, options: dict[str, t.Any] | None = None) -> None:
         super().__init__()
 
@@ -189,6 +184,48 @@ class CallbackBase(AnsiblePlugin):
     # helper for callbacks, so they don't all have to include deepcopy
     _copy_result = deepcopy
 
+    def _init_callback_methods(self) -> None:
+        """Record analysis of callback methods on each callback instance for dispatch optimization and deprecation warnings."""
+        implemented_callback_methods: set[str] = set()
+        deprecated_v1_method_overrides: set[str] = set()
+        plugin_file = sys.modules[type(self).__module__].__file__
+
+        if plugin_info := _deprecator._path_as_plugininfo(plugin_file):
+            plugin_name = plugin_info.resolved_name
+        else:
+            plugin_name = plugin_file
+
+        for base_v2_method, base_v1_method in CallbackBase._v2_v1_method_map.items():
+            method_name = None
+
+            if not inspect.ismethod(method := getattr(self, (v2_method_name := base_v2_method.__name__))) or method.__func__ is not base_v2_method:
+                implemented_callback_methods.add(v2_method_name)  # v2 method directly implemented by subclass
+                method_name = v2_method_name
+            elif base_v1_method is None:
+                pass  # no corresponding v1 method
+            elif not inspect.ismethod(method := getattr(self, (v1_method_name := base_v1_method.__name__))) or method.__func__ is not base_v1_method:
+                implemented_callback_methods.add(v2_method_name)  # v1 method directly implemented by subclass
+                deprecated_v1_method_overrides.add(v1_method_name)
+                method_name = v1_method_name
+
+            if method_name and v2_method_name == 'v2_on_any':
+                deprecated_v1_method_overrides.discard(method_name)  # avoid including v1 on_any in the v1 deprecation below
+
+                global_display.deprecated(
+                    msg=f'The {plugin_name!r} callback plugin implements deprecated method {method_name!r}.',
+                    version='2.23',
+                    help_text='Use event-specific callback methods instead.',
+                )
+
+        self._implemented_callback_methods = frozenset(implemented_callback_methods)
+
+        if deprecated_v1_method_overrides:
+            global_display.deprecated(
+                msg=f'The {plugin_name!r} callback plugin implements the following deprecated method(s): {", ".join(sorted(deprecated_v1_method_overrides))}',
+                version='2.23',
+                help_text='Implement the `v2_*` equivalent callback method(s) instead.',
+            )
+
     def set_option(self, k, v):
         self._plugin_options[k] = C.config.get_config_value(k, plugin_type=self.plugin_type, plugin_name=self._load_name, direct={k: v})
 
@@ -316,8 +353,7 @@ class CallbackBase(AnsiblePlugin):
         if res.pop('warnings', None) and self._current_task_result and (warnings := self._current_task_result.warnings):
             # display warnings from the current task result if `warnings` was not removed from `result` (or made falsey)
             for warning in warnings:
-                # DTFIX3: what to do about propagating wrap_text from the original display.warning call?
-                self._display._warning(warning, wrap_text=False)
+                self._display._warning(warning)
 
         if res.pop('deprecations', None) and self._current_task_result and (deprecations := self._current_task_result.deprecations):
             # display deprecations from the current task result if `deprecations` was not removed from `result` (or made falsey)
@@ -327,7 +363,7 @@ class CallbackBase(AnsiblePlugin):
     def _handle_exception(self, result: _c.MutableMapping[str, t.Any], use_stderr: bool = False) -> None:
         if result.pop('exception', None) and self._current_task_result and (exception := self._current_task_result.exception):
             # display exception from the current task result if `exception` was not removed from `result` (or made falsey)
-            self._display._error(exception, wrap_text=False, stderr=use_stderr)
+            self._display._error(exception, stderr=use_stderr)
 
     def _handle_warnings_and_exception(self, result: CallbackTaskResult) -> None:
         """Standardized handling of warnings/deprecations and exceptions from a task/item result."""
@@ -471,96 +507,61 @@ class CallbackBase(AnsiblePlugin):
     def set_play_context(self, play_context):
         pass
 
-    @_callback_base_impl
     def on_any(self, *args, **kwargs):
         pass
 
-    @_callback_base_impl
     def runner_on_failed(self, host, res, ignore_errors=False):
         pass
 
-    @_callback_base_impl
     def runner_on_ok(self, host, res):
         pass
 
-    @_callback_base_impl
     def runner_on_skipped(self, host, item=None):
         pass
 
-    @_callback_base_impl
     def runner_on_unreachable(self, host, res):
         pass
 
-    @_callback_base_impl
-    def runner_on_no_hosts(self):
-        pass
-
-    @_callback_base_impl
     def runner_on_async_poll(self, host, res, jid, clock):
         pass
 
-    @_callback_base_impl
     def runner_on_async_ok(self, host, res, jid):
         pass
 
-    @_callback_base_impl
     def runner_on_async_failed(self, host, res, jid):
         pass
 
-    @_callback_base_impl
     def playbook_on_start(self):
         pass
 
-    @_callback_base_impl
     def playbook_on_notify(self, host, handler):
         pass
 
-    @_callback_base_impl
     def playbook_on_no_hosts_matched(self):
         pass
 
-    @_callback_base_impl
     def playbook_on_no_hosts_remaining(self):
         pass
 
-    @_callback_base_impl
     def playbook_on_task_start(self, name, is_conditional):
         pass
 
-    @_callback_base_impl
     def playbook_on_vars_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None, unsafe=None):
         pass
 
-    @_callback_base_impl
-    def playbook_on_setup(self):
-        pass
-
-    @_callback_base_impl
-    def playbook_on_import_for_host(self, host, imported_file):
-        pass
-
-    @_callback_base_impl
-    def playbook_on_not_import_for_host(self, host, missing_file):
-        pass
-
-    @_callback_base_impl
     def playbook_on_play_start(self, name):
         pass
 
-    @_callback_base_impl
     def playbook_on_stats(self, stats):
         pass
 
-    @_callback_base_impl
     def on_file_diff(self, host, diff):
         pass
 
     # V2 METHODS, by default they call v1 counterparts if possible
-    @_callback_base_impl
     def v2_on_any(self, *args, **kwargs):
         self.on_any(args, kwargs)
 
-    @_callback_base_impl
     def v2_runner_on_failed(self, result: CallbackTaskResult, ignore_errors: bool = False) -> None:
         """Process results of a failed task.
 
@@ -583,7 +584,6 @@ class CallbackBase(AnsiblePlugin):
         host = result.host.get_name()
         self.runner_on_failed(host, result.result, ignore_errors)
 
-    @_callback_base_impl
     def v2_runner_on_ok(self, result: CallbackTaskResult) -> None:
         """Process results of a successful task.
 
@@ -596,7 +596,6 @@ class CallbackBase(AnsiblePlugin):
         host = result.host.get_name()
         self.runner_on_ok(host, result.result)
 
-    @_callback_base_impl
     def v2_runner_on_skipped(self, result: CallbackTaskResult) -> None:
         """Process results of a skipped task.
 
@@ -610,7 +609,6 @@ class CallbackBase(AnsiblePlugin):
             host = result.host.get_name()
             self.runner_on_skipped(host, self._get_item_label(getattr(result.result, 'results', {})))
 
-    @_callback_base_impl
     def v2_runner_on_unreachable(self, result: CallbackTaskResult) -> None:
         """Process results of a task if a target node is unreachable.
 
@@ -623,7 +621,6 @@ class CallbackBase(AnsiblePlugin):
         host = result.host.get_name()
         self.runner_on_unreachable(host, result.result)
 
-    @_callback_base_impl
     def v2_runner_on_async_poll(self, result: CallbackTaskResult) -> None:
         """Get details about an unfinished task running in async mode.
 
@@ -642,7 +639,6 @@ class CallbackBase(AnsiblePlugin):
         clock = 0
         self.runner_on_async_poll(host, result.result, jid, clock)
 
-    @_callback_base_impl
     def v2_runner_on_async_ok(self, result: CallbackTaskResult) -> None:
         """Process results of a successful task that ran in async mode.
 
@@ -656,7 +652,6 @@ class CallbackBase(AnsiblePlugin):
         jid = result.result.get('ansible_job_id')
         self.runner_on_async_ok(host, result.result, jid)
 
-    @_callback_base_impl
     def v2_runner_on_async_failed(self, result: CallbackTaskResult) -> None:
         host = result.host.get_name()
         # Attempt to get the async job ID. If the job does not finish before the
@@ -666,89 +661,84 @@ class CallbackBase(AnsiblePlugin):
             jid = result.result['async_result'].get('ansible_job_id')
         self.runner_on_async_failed(host, result.result, jid)
 
-    @_callback_base_impl
     def v2_playbook_on_start(self, playbook):
         self.playbook_on_start()
 
-    @_callback_base_impl
     def v2_playbook_on_notify(self, handler, host):
         self.playbook_on_notify(host, handler)
 
-    @_callback_base_impl
     def v2_playbook_on_no_hosts_matched(self):
         self.playbook_on_no_hosts_matched()
 
-    @_callback_base_impl
     def v2_playbook_on_no_hosts_remaining(self):
         self.playbook_on_no_hosts_remaining()
 
-    @_callback_base_impl
     def v2_playbook_on_task_start(self, task, is_conditional):
         self.playbook_on_task_start(task.name, is_conditional)
 
-    # FIXME: not called
-    @_callback_base_impl
-    def v2_playbook_on_cleanup_task_start(self, task):
-        pass  # no v1 correspondence
-
-    @_callback_base_impl
     def v2_playbook_on_handler_task_start(self, task):
         pass  # no v1 correspondence
 
-    @_callback_base_impl
     def v2_playbook_on_vars_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None, unsafe=None):
         self.playbook_on_vars_prompt(varname, private, prompt, encrypt, confirm, salt_size, salt, default, unsafe)
 
-    # FIXME: not called
-    @_callback_base_impl
-    def v2_playbook_on_import_for_host(self, result: CallbackTaskResult, imported_file) -> None:
-        host = result.host.get_name()
-        self.playbook_on_import_for_host(host, imported_file)
-
-    # FIXME: not called
-    @_callback_base_impl
-    def v2_playbook_on_not_import_for_host(self, result: CallbackTaskResult, missing_file) -> None:
-        host = result.host.get_name()
-        self.playbook_on_not_import_for_host(host, missing_file)
-
-    @_callback_base_impl
     def v2_playbook_on_play_start(self, play):
         self.playbook_on_play_start(play.name)
 
-    @_callback_base_impl
     def v2_playbook_on_stats(self, stats):
         self.playbook_on_stats(stats)
 
-    @_callback_base_impl
     def v2_on_file_diff(self, result: CallbackTaskResult) -> None:
         if 'diff' in result.result:
             host = result.host.get_name()
             self.on_file_diff(host, result.result['diff'])
 
-    @_callback_base_impl
     def v2_playbook_on_include(self, included_file):
         pass  # no v1 correspondence
 
-    @_callback_base_impl
     def v2_runner_item_on_ok(self, result: CallbackTaskResult) -> None:
         pass
 
-    @_callback_base_impl
     def v2_runner_item_on_failed(self, result: CallbackTaskResult) -> None:
         pass
 
-    @_callback_base_impl
     def v2_runner_item_on_skipped(self, result: CallbackTaskResult) -> None:
         pass
 
-    @_callback_base_impl
     def v2_runner_retry(self, result: CallbackTaskResult) -> None:
         pass
 
-    @_callback_base_impl
     def v2_runner_on_start(self, host, task):
         """Event used when host begins execution of a task
 
         .. versionadded:: 2.8
         """
         pass
+
+    _v2_v1_method_map = {
+        v2_on_any: on_any,
+        v2_on_file_diff: on_file_diff,
+        v2_playbook_on_handler_task_start: None,
+        v2_playbook_on_include: None,
+        v2_playbook_on_no_hosts_matched: playbook_on_no_hosts_matched,
+        v2_playbook_on_no_hosts_remaining: playbook_on_no_hosts_remaining,
+        v2_playbook_on_notify: playbook_on_notify,
+        v2_playbook_on_play_start: playbook_on_play_start,
+        v2_playbook_on_start: playbook_on_start,
+        v2_playbook_on_stats: playbook_on_stats,
+        v2_playbook_on_task_start: playbook_on_task_start,
+        v2_playbook_on_vars_prompt: playbook_on_vars_prompt,
+        v2_runner_item_on_failed: None,
+        v2_runner_item_on_ok: None,
+        v2_runner_item_on_skipped: None,
+        v2_runner_on_async_failed: runner_on_async_failed,
+        v2_runner_on_async_ok: runner_on_async_ok,
+        v2_runner_on_async_poll: runner_on_async_poll,
+        v2_runner_on_failed: runner_on_failed,
+        v2_runner_on_ok: runner_on_ok,
+        v2_runner_on_skipped: runner_on_skipped,
+        v2_runner_on_start: None,
+        v2_runner_on_unreachable: runner_on_unreachable,
+        v2_runner_retry: None,
+    }
+    """Internal mapping of v2 callback methods with v1 counterparts; populated after type init for deprecation warnings and bypass calculation."""

ansible/plugins/callback/default.py

@@ -197,9 +197,6 @@ class CallbackModule(CallbackBase):
 
         self._last_task_banner = task._uuid
 
-    def v2_playbook_on_cleanup_task_start(self, task):
-        self._task_start(task, prefix='CLEANUP TASK')
-
     def v2_playbook_on_handler_task_start(self, task):
         self._task_start(task, prefix='RUNNING HANDLER')
 

ansible/plugins/callback/junit.py

@@ -300,15 +300,9 @@ class CallbackModule(CallbackBase):
     def v2_playbook_on_play_start(self, play):
         self._play_name = play.get_name()
 
-    def v2_runner_on_no_hosts(self, task: Task) -> None:
-        self._start_task(task)
-
     def v2_playbook_on_task_start(self, task: Task, is_conditional: bool) -> None:
         self._start_task(task)
 
-    def v2_playbook_on_cleanup_task_start(self, task: Task) -> None:
-        self._start_task(task)
-
     def v2_playbook_on_handler_task_start(self, task: Task) -> None:
         self._start_task(task)
 

ansible/plugins/callback/tree.py

@@ -31,7 +31,7 @@ import os
 
 from ansible.constants import TREE_DIR
 from ansible.executor.task_result import CallbackTaskResult
-from ansible.module_utils.common.text.converters import to_bytes, to_text
+from ansible.module_utils.common.text.converters import to_bytes
 from ansible.plugins.callback import CallbackBase
 from ansible.utils.path import makedirs_safe, unfrackpath
 from ansible.module_utils._internal import _deprecator
@@ -73,15 +73,15 @@ class CallbackModule(CallbackBase):
         buf = to_bytes(buf)
         try:
             makedirs_safe(self.tree)
-        except (OSError, IOError) as e:
-            self._display.warning(u"Unable to access or create the configured directory (%s): %s" % (to_text(self.tree), to_text(e)))
+        except OSError as ex:
+            self._display.error_as_warning(f"Unable to access or create the configured directory {self.tree!r}.", exception=ex)
 
         try:
             path = to_bytes(os.path.join(self.tree, hostname))
             with open(path, 'wb+') as fd:
                 fd.write(buf)
-        except (OSError, IOError) as e:
-            self._display.warning(u"Unable to write to %s's file: %s" % (hostname, to_text(e)))
+        except OSError as ex:
+            self._display.error_as_warning(f"Unable to write to {hostname!r}'s file.", exception=ex)
 
     def result_to_tree(self, result: CallbackTaskResult) -> None:
         self.write_tree_file(result.host.get_name(), self._dump_results(result.result))

ansible/plugins/connection/local.py

@@ -114,8 +114,8 @@ class Connection(ConnectionBase):
             # privileges or the command otherwise needs a pty.
             try:
                 pty_primary, stdin = pty.openpty()
-            except (IOError, OSError) as e:
-                display.debug("Unable to open pty: %s" % to_native(e))
+            except OSError as ex:
+                display.debug(f"Unable to open pty: {ex}")
 
         p = subprocess.Popen(
             cmd,
@@ -271,8 +271,8 @@ class Connection(ConnectionBase):
             shutil.copyfile(to_bytes(in_path, errors='surrogate_or_strict'), to_bytes(out_path, errors='surrogate_or_strict'))
         except shutil.Error:
             raise AnsibleError("failed to copy: {0} and {1} are the same".format(to_native(in_path), to_native(out_path)))
-        except IOError as e:
-            raise AnsibleError("failed to transfer file to {0}: {1}".format(to_native(out_path), to_native(e)))
+        except OSError as ex:
+            raise AnsibleError(f"Failed to transfer file to {out_path!r}.") from ex
 
     def fetch_file(self, in_path: str, out_path: str) -> None:
         """ fetch a file from local to local -- for compatibility """

ansible/plugins/connection/paramiko_ssh.py

@@ -413,7 +413,7 @@ class Connection(ConnectionBase):
                     # TODO: check if we need to look at several possible locations, possible for loop
                     ssh.load_system_host_keys(ssh_known_hosts)
                     break
-                except IOError:
+                except OSError:
                     pass  # file was not found, but not required to function
             ssh.load_system_host_keys()
 
@@ -567,8 +567,8 @@ class Connection(ConnectionBase):
 
         try:
             self.sftp.put(to_bytes(in_path, errors='surrogate_or_strict'), to_bytes(out_path, errors='surrogate_or_strict'))
-        except IOError:
-            raise AnsibleError("failed to transfer file to %s" % out_path)
+        except OSError as ex:
+            raise AnsibleError(f"Failed to transfer file to {out_path!r}.") from ex
 
     def _connect_sftp(self) -> paramiko.sftp_client.SFTPClient:
 
@@ -593,8 +593,8 @@ class Connection(ConnectionBase):
 
         try:
             self.sftp.get(to_bytes(in_path, errors='surrogate_or_strict'), to_bytes(out_path, errors='surrogate_or_strict'))
-        except IOError:
-            raise AnsibleError("failed to transfer file from %s" % in_path)
+        except OSError as ex:
+            raise AnsibleError(f"Failed to transfer file from {in_path!r}.") from ex
 
     def _any_keys_added(self) -> bool:
 

ansible/plugins/connection/ssh.py

@@ -332,7 +332,9 @@ DOCUMENTATION = """
             version_added: '2.7'
       sftp_batch_mode:
         default: true
-        description: 'TODO: write it'
+        description:
+          - When set to C(True), sftp will be run in batch mode, allowing detection of transfer errors.
+          - When set to C(False), sftp will not be run in batch mode, preventing detection of transfer errors.
         env: [{name: ANSIBLE_SFTP_BATCH_MODE}]
         ini:
         - {key: sftp_batch_mode, section: ssh_connection}
@@ -977,7 +979,7 @@ class Connection(ConnectionBase):
         try:
             fh.write(to_bytes(in_data))
             fh.close()
-        except (OSError, IOError) as ex:
+        except OSError as ex:
             # The ssh connection may have already terminated at this point, with a more useful error
             # Only raise AnsibleConnectionFailure if the ssh process is still alive
             time.sleep(0.001)
@@ -993,7 +995,7 @@ class Connection(ConnectionBase):
         """ Terminate a process, ignoring errors """
         try:
             p.terminate()
-        except (OSError, IOError):
+        except OSError:
             pass
 
     # This is separate from _run() because we need to do the same thing for stdout
@@ -1134,7 +1136,7 @@ class Connection(ConnectionBase):
                 p = subprocess.Popen(cmd, stdin=slave, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **popen_kwargs)
                 stdin = os.fdopen(master, 'wb', 0)
                 os.close(slave)
-            except (OSError, IOError):
+            except OSError:
                 p = None
 
         if not p:
@@ -1142,8 +1144,8 @@ class Connection(ConnectionBase):
                 p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                                      stderr=subprocess.PIPE, **popen_kwargs)
                 stdin = p.stdin  # type: ignore[assignment] # stdin will be set and not None due to the calls above
-            except (OSError, IOError) as e:
-                raise AnsibleError('Unable to execute ssh command line on a controller due to: %s' % to_native(e))
+            except OSError as ex:
+                raise AnsibleError('Unable to execute ssh command line on a controller.') from ex
 
         if password_mechanism == 'sshpass' and conn_password:
             os.close(self.sshpass_pipe[0])
@@ -1169,7 +1171,7 @@ class Connection(ConnectionBase):
 
         # Are we requesting privilege escalation? Right now, we may be invoked
         # to execute sftp/scp with sudoable=True, but we can request escalation
-        # only when using ssh. Otherwise we can send initial data straightaway.
+        # only when using ssh. Otherwise, we can send initial data straight away.
 
         state = states.index('ready_to_send')
         if to_bytes(self.get_option('ssh_executable')) in cmd and sudoable:

ansible/plugins/connection/winrm.py

@@ -828,7 +828,7 @@ class Connection(ConnectionBase):
                     stderr = to_text(b_stderr)
 
                     if status_code != 0:
-                        raise IOError(stderr)
+                        raise OSError(stderr)
                     if stdout.strip() == '[DIR]':
                         data = None
                     else:

ansible/plugins/filter/core.py

@@ -32,10 +32,10 @@ from ansible.module_utils.common.json import get_encoder, get_decoder
 from ansible.module_utils.six import string_types, integer_types, text_type
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.module_utils.common.collections import is_sequence
-from ansible.module_utils.common.yaml import yaml_load, yaml_load_all
 from ansible.parsing.yaml.dumper import AnsibleDumper
 from ansible.template import accept_args_markers, accept_lazy_markers
 from ansible._internal._templating._jinja_common import MarkerError, UndefinedMarker, validate_arg_type
+from ansible._internal._yaml import _loader as _yaml_loader
 from ansible.utils.display import Display
 from ansible.utils.encrypt import do_encrypt, PASSLIB_AVAILABLE
 from ansible.utils.hashing import md5s, checksum_s
@@ -47,13 +47,13 @@ display = Display()
 UUID_NAMESPACE_ANSIBLE = uuid.UUID('361E6D51-FAEC-444A-9079-341386DA8E2E')
 
 
-def to_yaml(a, *_args, default_flow_style: bool | None = None, dump_vault_tags: bool | None = None, **kwargs) -> str:
+@accept_lazy_markers
+def to_yaml(a, *_args, default_flow_style: bool | None = None, **kwargs) -> str:
     """Serialize input as terse flow-style YAML."""
-    dumper = partial(AnsibleDumper, dump_vault_tags=dump_vault_tags)
-
-    return yaml.dump(a, Dumper=dumper, allow_unicode=True, default_flow_style=default_flow_style, **kwargs)
+    return yaml.dump(a, Dumper=AnsibleDumper, allow_unicode=True, default_flow_style=default_flow_style, **kwargs)
 
 
+@accept_lazy_markers
 def to_nice_yaml(a, indent=4, *_args, default_flow_style=False, **kwargs) -> str:
     """Serialize input as verbose multi-line YAML."""
     return to_yaml(a, indent=indent, default_flow_style=default_flow_style, **kwargs)
@@ -98,6 +98,7 @@ _valid_bool_false = {'no', 'off', 'false', '0'}
 def to_bool(value: object) -> bool:
     """Convert well-known input values to a boolean value."""
     value_to_check: object
+
     if isinstance(value, str):
         value_to_check = value.lower()  # accept mixed case variants
     elif isinstance(value, int):  # bool is also an int
@@ -105,14 +106,17 @@ def to_bool(value: object) -> bool:
     else:
         value_to_check = value
 
-    if value_to_check in _valid_bool_true:
-        return True
+    try:
+        if value_to_check in _valid_bool_true:
+            return True
 
-    if value_to_check in _valid_bool_false:
-        return False
+        if value_to_check in _valid_bool_false:
+            return False
 
-    # if we're still here, the value is unsupported- always fire a deprecation warning
-    result = value_to_check == 1  # backwards compatibility with the old code which checked: value in ('yes', 'on', '1', 'true', 1)
+        # if we're still here, the value is unsupported- always fire a deprecation warning
+        result = value_to_check == 1  # backwards compatibility with the old code which checked: value in ('yes', 'on', '1', 'true', 1)
+    except TypeError:
+        result = False
 
     # NB: update the doc string to reflect reality once this fallback is removed
     display.deprecated(
@@ -250,11 +254,8 @@ def from_yaml(data):
     if data is None:
         return None
 
-    if isinstance(data, string_types):
-        # The ``text_type`` call here strips any custom
-        # string wrapper class, so that CSafeLoader can
-        # read the data
-        return yaml_load(text_type(to_text(data, errors='surrogate_or_strict')))
+    if isinstance(data, str):
+        return yaml.load(data, Loader=_yaml_loader.AnsibleInstrumentedLoader)  # type: ignore[arg-type]
 
     display.deprecated(f"The from_yaml filter ignored non-string input of type {native_type_name(data)!r}.", version='2.23', obj=data)
     return data
@@ -264,11 +265,8 @@ def from_yaml_all(data):
     if data is None:
         return []  # backward compatibility; ensure consistent result between classic/native Jinja for None/empty string input
 
-    if isinstance(data, string_types):
-        # The ``text_type`` call here strips any custom
-        # string wrapper class, so that CSafeLoader can
-        # read the data
-        return yaml_load_all(text_type(to_text(data, errors='surrogate_or_strict')))
+    if isinstance(data, str):
+        return yaml.load_all(data, Loader=_yaml_loader.AnsibleInstrumentedLoader)  # type: ignore[arg-type]
 
     display.deprecated(f"The from_yaml_all filter ignored non-string input of type {native_type_name(data)!r}.", version='2.23', obj=data)
     return data

ansible/plugins/filter/encryption.py

@@ -21,7 +21,11 @@ def do_vault(data, secret, salt=None, vault_id='filter_default', wrap_object=Fal
         raise TypeError(f"Can only vault strings, instead we got {type(data)}.")
 
     if vaultid is not None:
-        display.deprecated("Use of undocumented 'vaultid', use 'vault_id' instead", version='2.20')
+        display.deprecated(
+            msg="Use of undocumented `vaultid`.",
+            version="2.20",
+            help_text="Use `vault_id` instead.",
+        )
 
         if vault_id == 'filter_default':
             vault_id = vaultid
@@ -58,7 +62,11 @@ def do_unvault(vault, secret, vault_id='filter_default', vaultid=None):
         raise TypeError(f"Vault should be in the form of a string, instead we got {type(vault)}.")
 
     if vaultid is not None:
-        display.deprecated("Use of undocumented 'vaultid', use 'vault_id' instead", version='2.20')
+        display.deprecated(
+            msg="Use of undocumented `vaultid`.",
+            version="2.20",
+            help_text="Use `vault_id` instead.",
+        )
 
         if vault_id == 'filter_default':
             vault_id = vaultid

ansible/plugins/filter/pow.yml

@@ -3,7 +3,7 @@ DOCUMENTATION:
   version_added: "1.9"
   short_description: power of (math operation)
   description:
-    - Math operation that returns the Nth power of inputed number, C(X ^ N).
+    - Math operation that returns the Nth power of inputted number, C(X ^ N).
   notes:
     - This is a passthrough to Python's C(math.pow).
   positional: _input, _power