ansible-core 2.19.0b6__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/connection/ssh.py

@@ -1171,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/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

ansible/plugins/filter/root.yml

@@ -3,7 +3,7 @@ DOCUMENTATION:
   version_added: "1.9"
   short_description: root of (math operation)
   description:
-    - Math operation that returns the Nth root of inputed number C(X ^^ N).
+    - Math operation that returns the Nth root of inputted number C(X ^^ N).
   positional: _input, base
   options:
     _input:

ansible/plugins/filter/strftime.yml

@@ -1,16 +1,16 @@
 DOCUMENTATION:
   name: strftime
   version_added: "2.4"
-  short_description: date formating
+  short_description: date formatting
   description:
-    - Using Python's C(strftime) function, take a data formating string and a date/time to create a formatted date.
+    - Using Python's C(strftime) function, take a data formatting string and a date/time to create a formatted date.
   notes:
     - This is a passthrough to Python's C(stftime), for a complete set of formatting options go to https://strftime.org/.
   positional: _input, second, utc
   options:
     _input:
       description:
-        - A formating string following C(stftime) conventions.
+        - A formatting string following C(stftime) conventions.
         - See L(the Python documentation, https://docs.python.org/3/library/datetime.html#strftime-strptime-behavior) for a reference.
       type: str
       required: true

ansible/plugins/filter/to_uuid.yml

@@ -7,7 +7,7 @@ DOCUMENTATION:
   positional: _input, namespace
   options:
     _input:
-      description: String to use as base fo the UUID.
+      description: String to use as base of the UUID.
       type: str
       required: true
     namespace:

ansible/plugins/inventory/script.py

@@ -98,7 +98,7 @@ EXAMPLES = r'''# fmt: code
     def get_api_data(namespace: str, pretty=False) -> str:
         """
         :param namespace: parameter for our custom api
-        :param pretty: Human redable JSON vs machine readable
+        :param pretty: Human readable JSON vs machine readable
         :return: JSON string
         """
         found_data = list(MyInventoryAPI(namespace))

ansible/plugins/loader.py

@@ -989,6 +989,9 @@ class PluginLoader:
     def get_with_context(self, name, *args, **kwargs) -> get_with_context_result:
         """ instantiates a plugin of the given name using arguments """
 
+        if not name:
+            raise ValueError('A non-empty plugin name is required.')
+
         found_in_cache = True
         class_only = kwargs.pop('class_only', False)
         collection_list = kwargs.pop('collection_list', None)
@@ -1034,6 +1037,7 @@ class PluginLoader:
             except AttributeError:
                 return get_with_context_result(None, plugin_load_context)
             if not issubclass(obj, plugin_class):
+                display.warning(f"Ignoring {self.type} plugin {resolved_type_name!r} due to missing base class {self.base_class!r}.")
                 return get_with_context_result(None, plugin_load_context)
 
         # FIXME: update this to use the load context
@@ -1721,6 +1725,7 @@ callback_loader = PluginLoader(
     'ansible.plugins.callback',
     C.DEFAULT_CALLBACK_PLUGIN_PATH,
     'callback_plugins',
+    required_base_class='CallbackBase',
 )
 
 connection_loader = PluginLoader(

ansible/plugins/lookup/password.py

@@ -126,6 +126,7 @@ _raw:
   elements: str
 """
 
+import contextlib
 import os
 import string
 import time
@@ -269,15 +270,12 @@ def _get_lock(b_path):
     b_pathdir = os.path.dirname(b_path)
     lockfile_name = to_bytes("%s.ansible_lockfile" % hashlib.sha1(b_path).hexdigest())
     lockfile = os.path.join(b_pathdir, lockfile_name)
-    if not os.path.exists(lockfile) and b_path != to_bytes('/dev/null'):
-        try:
-            makedirs_safe(b_pathdir, mode=0o700)
+    if b_path != b'/dev/null':
+        makedirs_safe(b_pathdir, mode=0o700)
+        with contextlib.suppress(FileExistsError):
             fd = os.open(lockfile, os.O_CREAT | os.O_EXCL)
             os.close(fd)
             first_process = True
-        except OSError as e:
-            if e.strerror != 'File exists':
-                raise
 
     counter = 0
     # if the lock is got by other process, wait until it's released

ansible/release.py

@@ -17,6 +17,6 @@
 
 from __future__ import annotations
 
-__version__ = '2.19.0b6'
+__version__ = '2.19.0b7'
 __author__ = 'Ansible, Inc.'
 __codename__ = "What Is and What Should Never Be"

ansible/utils/display.py

@@ -40,7 +40,6 @@ import secrets
 import subprocess
 import sys
 import termios
-import textwrap
 import threading
 import time
 import tty
@@ -329,7 +328,6 @@ class Display(metaclass=Singleton):
         self.noncow = C.ANSIBLE_COW_SELECTION
 
         self.set_cowsay_info()
-        self._wrap_stderr = C.WRAP_STDERR
 
         if self.b_cowsay:
             try:
@@ -621,6 +619,12 @@ class Display(metaclass=Singleton):
             # collections have a resolved_name but no type
             collection = deprecator.resolved_name if deprecator else None
             plugin_fragment = ''
+        elif deprecator.resolved_name == 'ansible.builtin':
+            # core deprecations from base classes (the API) have no plugin name, only 'ansible.builtin'
+            plugin_type_name = str(deprecator.type) if deprecator.type is _messages.PluginType.MODULE else f'{deprecator.type} plugin'
+
+            collection = deprecator.resolved_name
+            plugin_fragment = f'the {plugin_type_name} API'
         else:
             parts = deprecator.resolved_name.split('.')
             plugin_name = parts[-1]
@@ -657,13 +661,6 @@ class Display(metaclass=Singleton):
 
         return _join_sentences(msg, deprecation_msg)
 
-    def _wrap_message(self, msg: str, wrap_text: bool) -> str:
-        if wrap_text and self._wrap_stderr:
-            wrapped = textwrap.wrap(msg, self.columns, drop_whitespace=False)
-            msg = "\n".join(wrapped) + "\n"
-
-        return msg
-
     @staticmethod
     def _deduplicate(msg: str, messages: set[str]) -> bool:
         """
@@ -780,9 +777,6 @@ class Display(metaclass=Singleton):
         msg = _format_message(warning, _traceback.is_traceback_enabled(_traceback.TracebackEvent.DEPRECATED))
         msg = f'[DEPRECATION WARNING]: {msg}'
 
-        # DTFIX3: what should we do with wrap_message?
-        msg = self._wrap_message(msg=msg, wrap_text=True)
-
         if self._deduplicate(msg, self._deprecations):
             return
 
@@ -799,6 +793,8 @@ class Display(metaclass=Singleton):
         """Display a warning message."""
         _skip_stackwalk = True
 
+        # deprecated: description='The formatted argument has no effect.' core_version='2.23'
+
         # This is the pre-proxy half of the `warning` implementation.
         # Any logic that must occur on workers needs to be implemented here.
 
@@ -818,13 +814,12 @@ class Display(metaclass=Singleton):
 
         if warning_ctx := _DeferredWarningContext.current(optional=True):
             warning_ctx.capture(warning)
-            # DTFIX3: what to do about propagating wrap_text?
             return
 
-        self._warning(warning, wrap_text=not formatted)
+        self._warning(warning)
 
     @_proxy
-    def _warning(self, warning: _messages.WarningSummary, wrap_text: bool) -> None:
+    def _warning(self, warning: _messages.WarningSummary) -> None:
         """Internal implementation detail, use `warning` instead."""
 
         # This is the post-proxy half of the `warning` implementation.
@@ -836,9 +831,6 @@ class Display(metaclass=Singleton):
         if self._deduplicate(msg, self._warns):
             return
 
-        # DTFIX3: what should we do with wrap_message?
-        msg = self._wrap_message(msg=msg, wrap_text=wrap_text)
-
         self.display(msg, color=C.config.get_config_value('COLOR_WARN'), stderr=True, caplevel=-2)
 
     @_proxy
@@ -927,19 +919,20 @@ class Display(metaclass=Singleton):
             warning_ctx.capture(warning)
             return
 
-        self._warning(warning, wrap_text=False)
+        self._warning(warning)
 
     def error(self, msg: str | BaseException, wrap_text: bool = True, stderr: bool = True) -> None:
         """Display an error message."""
         _skip_stackwalk = True
 
+        # deprecated: description='The wrap_text argument has no effect.' core_version='2.23'
+        # deprecated: description='The stderr argument has no effect.' core_version='2.23'
+
         # This is the pre-proxy half of the `error` implementation.
         # Any logic that must occur on workers needs to be implemented here.
 
         if isinstance(msg, BaseException):
             event = _error_factory.ControllerEventFactory.from_exception(msg, _traceback.is_traceback_enabled(_traceback.TracebackEvent.ERROR))
-
-            wrap_text = False
         else:
             event = _messages.Event(
                 msg=msg,
@@ -950,10 +943,10 @@ class Display(metaclass=Singleton):
             event=event,
         )
 
-        self._error(error, wrap_text=wrap_text, stderr=stderr)
+        self._error(error, stderr=True)
 
     @_proxy
-    def _error(self, error: _messages.ErrorSummary, wrap_text: bool, stderr: bool) -> None:
+    def _error(self, error: _messages.ErrorSummary, stderr: bool) -> None:
         """Internal implementation detail, use `error` instead."""
 
         # This is the post-proxy half of the `error` implementation.
@@ -965,9 +958,6 @@ class Display(metaclass=Singleton):
         if self._deduplicate(msg, self._errors):
             return
 
-        # DTFIX3: what should we do with wrap_message?
-        msg = self._wrap_message(msg=msg, wrap_text=wrap_text)
-
         self.display(msg, color=C.config.get_config_value('COLOR_ERROR'), stderr=stderr, caplevel=-1)
 
     @staticmethod

ansible/utils/path.py

@@ -102,7 +102,7 @@ def basedir(source):
         dname = os.path.dirname(source)
 
     if dname:
-        # don't follow symlinks for basedir, enables source re-use
+        # don't follow symlinks for basedir, enables source reuse
         dname = os.path.abspath(dname)
 
     return to_text(dname, errors='surrogate_or_strict')