ansible-core 2.19.0b2__py3-none-any.whl → 2.19.0b4__py3-none-any.whl

ansible/module_utils/common/warnings.py

@@ -4,15 +4,12 @@
 
 from __future__ import annotations as _annotations
 
-import datetime as _datetime
 import typing as _t
 
-from ansible.module_utils._internal import _traceback, _plugin_exec_context
+from ansible.module_utils._internal import _traceback, _deprecator
 from ansible.module_utils.common import messages as _messages
 from ansible.module_utils import _internal
 
-_UNSET = _t.cast(_t.Any, object())
-
 
 def warn(warning: str) -> None:
     """Record a warning to be returned with the module result."""
@@ -28,22 +25,23 @@ def warn(warning: str) -> None:
 def deprecate(
     msg: str,
     version: str | None = None,
-    date: str | _datetime.date | None = None,
-    collection_name: str | None = _UNSET,
+    date: str | None = None,
+    collection_name: str | None = None,
     *,
+    deprecator: _messages.PluginInfo | None = None,
     help_text: str | None = None,
     obj: object | None = None,
 ) -> None:
     """
-    Record a deprecation warning to be returned with the module result.
+    Record a deprecation warning.
     The `obj` argument is only useful in a controller context; it is ignored for target-side callers.
+    Most callers do not need to provide `collection_name` or `deprecator` -- but provide only one if needed.
+    Specify `version` or `date`, but not both.
+    If `date` is a string, it must be in the form `YYYY-MM-DD`.
     """
-    if isinstance(date, _datetime.date):
-        date = str(date)
+    _skip_stackwalk = True
 
-    # deprecated: description='enable the deprecation message for collection_name' core_version='2.23'
-    # if collection_name is not _UNSET:
-    #     deprecate('The `collection_name` argument to `deprecate` is deprecated.', version='2.27')
+    deprecator = _deprecator.get_best_deprecator(deprecator=deprecator, collection_name=collection_name)
 
     if _internal.is_controller:
         _display = _internal.import_controller_module('ansible.utils.display').Display()
@@ -53,6 +51,8 @@ def deprecate(
             date=date,
             help_text=help_text,
             obj=obj,
+            # skip passing collection_name; get_best_deprecator already accounted for it when present
+            deprecator=deprecator,
         )
 
         return
@@ -64,7 +64,7 @@ def deprecate(
         formatted_traceback=_traceback.maybe_capture_traceback(_traceback.TracebackEvent.DEPRECATED),
         version=version,
         date=date,
-        plugin=_plugin_exec_context.PluginExecContext.get_current_plugin_info(),
+        deprecator=deprecator,
     )] = None
 
 

ansible/module_utils/datatag.py

@@ -1,11 +1,11 @@
 """Public API for data tagging."""
 from __future__ import annotations as _annotations
 
-import datetime as _datetime
 import typing as _t
 
-from ._internal import _plugin_exec_context, _datatag
+from ._internal import _datatag, _deprecator
 from ._internal._datatag import _tags
+from .common import messages as _messages
 
 _T = _t.TypeVar('_T')
 
@@ -14,28 +14,28 @@ def deprecate_value(
     value: _T,
     msg: str,
     *,
+    version: str | None = None,
+    date: str | None = None,
+    collection_name: str | None = None,
+    deprecator: _messages.PluginInfo | None = None,
     help_text: str | None = None,
-    removal_date: str | _datetime.date | None = None,
-    removal_version: str | None = None,
 ) -> _T:
     """
     Return `value` tagged with the given deprecation details.
     The types `None` and `bool` cannot be deprecated and are returned unmodified.
     Raises a `TypeError` if `value` is not a supported type.
-    If `removal_date` is a string, it must be in the form `YYYY-MM-DD`.
-    This function is only supported in contexts where an Ansible plugin/module is executing.
+    Most callers do not need to provide `collection_name` or `deprecator` -- but provide only one if needed.
+    Specify `version` or `date`, but not both.
+    If `date` is provided, it should be in the form `YYYY-MM-DD`.
     """
-    if isinstance(removal_date, str):
-        # The `fromisoformat` method accepts other ISO 8601 formats than `YYYY-MM-DD` starting with Python 3.11.
-        # That should be considered undocumented behavior of `deprecate_value` rather than an intentional feature.
-        removal_date = _datetime.date.fromisoformat(removal_date)
+    _skip_stackwalk = True
 
     deprecated = _tags.Deprecated(
         msg=msg,
         help_text=help_text,
-        removal_date=removal_date,
-        removal_version=removal_version,
-        plugin=_plugin_exec_context.PluginExecContext.get_current_plugin_info(),
+        date=date,
+        version=version,
+        deprecator=_deprecator.get_best_deprecator(deprecator=deprecator, collection_name=collection_name),
     )
 
     return deprecated.tag(value)

ansible/module_utils/facts/virtual/linux.py

@@ -151,7 +151,7 @@ class LinuxVirtual(Virtual):
         sys_vendor = get_file_content('/sys/devices/virtual/dmi/id/sys_vendor')
         product_family = get_file_content('/sys/devices/virtual/dmi/id/product_family')
 
-        if product_name in ('KVM', 'KVM Server', 'Bochs', 'AHV'):
+        if product_name in ('KVM', 'KVM Server', 'Bochs', 'AHV', 'CloudStack KVM Hypervisor'):
             guest_tech.add('kvm')
             if not found_virt:
                 virtual_facts['virtualization_type'] = 'kvm'

ansible/module_utils/parsing/convert_bool.py

@@ -3,6 +3,8 @@
 
 from __future__ import annotations
 
+import collections.abc as c
+
 from ansible.module_utils.six import binary_type, text_type
 from ansible.module_utils.common.text.converters import to_text
 
@@ -17,9 +19,13 @@ def boolean(value, strict=True):
         return value
 
     normalized_value = value
+
     if isinstance(value, (text_type, binary_type)):
         normalized_value = to_text(value, errors='surrogate_or_strict').lower().strip()
 
+    if not isinstance(value, c.Hashable):
+        normalized_value = None  # prevent unhashable types from bombing, but keep the rest of the existing fallback/error behavior
+
     if normalized_value in BOOLEANS_TRUE:
         return True
     elif normalized_value in BOOLEANS_FALSE or not strict:

ansible/modules/assemble.py

@@ -181,7 +181,7 @@ def assemble_from_fragments(src_path, delimiter=None, compiled_regexp=None, igno
     return temp_path
 
 
-def cleanup(path, result=None):
+def cleanup(module, path, result=None):
     # cleanup just in case
     if os.path.exists(path):
         try:
@@ -189,7 +189,7 @@ def cleanup(path, result=None):
         except (IOError, OSError) as e:
             # don't error on possible race conditions, but keep warning
             if result is not None:
-                result['warnings'] = ['Unable to remove temp file (%s): %s' % (path, to_native(e))]
+                module.warn('Unable to remove temp file (%s): %s' % (path, to_native(e)))
 
 
 def main():
@@ -261,7 +261,7 @@ def main():
             (rc, out, err) = module.run_command(validate % path)
             result['validation'] = dict(rc=rc, stdout=out, stderr=err)
             if rc != 0:
-                cleanup(path)
+                cleanup(module, path)
                 module.fail_json(msg="failed to validate: rc:%s error:%s" % (rc, err))
         if backup and dest_hash is not None:
             result['backup_file'] = module.backup_local(dest)
@@ -269,7 +269,7 @@ def main():
         module.atomic_move(path, dest, unsafe_writes=module.params['unsafe_writes'])
         changed = True
 
-    cleanup(path, result)
+    cleanup(module, path, result)
 
     # handle file permissions
     file_args = module.load_file_common_arguments(module.params)

ansible/modules/async_status.py

@@ -68,7 +68,7 @@ EXAMPLES = r"""
   ansible.builtin.async_status:
     jid: '{{ dnf_sleeper.ansible_job_id }}'
   register: job_result
-  until: job_result.finished
+  until: job_result is finished
   retries: 100
   delay: 10
 

ansible/modules/cron.py

@@ -618,7 +618,6 @@ def main():
 
     changed = False
     res_args = dict()
-    warnings = list()
 
     if cron_file:
 
@@ -627,8 +626,8 @@ def main():
 
         cron_file_basename = os.path.basename(cron_file)
         if not re.search(r'^[A-Z0-9_-]+$', cron_file_basename, re.I):
-            warnings.append('Filename portion of cron_file ("%s") should consist' % cron_file_basename +
-                            ' solely of upper- and lower-case letters, digits, underscores, and hyphens')
+            module.warn('Filename portion of cron_file ("%s") should consist' % cron_file_basename +
+                        ' solely of upper- and lower-case letters, digits, underscores, and hyphens')
 
     # Ensure all files generated are only writable by the owning user.  Primarily relevant for the cron_file option.
     os.umask(int('022', 8))
@@ -693,7 +692,7 @@ def main():
         if do_install:
             for char in ['\r', '\n']:
                 if char in job.strip('\r\n'):
-                    warnings.append('Job should not contain line breaks')
+                    module.warn('Job should not contain line breaks')
                     break
 
             job = crontab.get_cron_job(minute, hour, day, month, weekday, job, special_time, disabled)
@@ -734,7 +733,6 @@ def main():
     res_args = dict(
         jobs=crontab.get_jobnames(),
         envs=crontab.get_envnames(),
-        warnings=warnings,
         changed=changed
     )
 

ansible/modules/dnf5.py

@@ -722,6 +722,7 @@ class Dnf5Module(YumDnf):
             if self.security:
                 types.append("security")
             advisory_query.filter_type(types)
+            conf.skip_unavailable = True  # ignore packages that are of a different type, for backwards compat
             settings.set_advisory_filter(advisory_query)
 
         goal = libdnf5.base.Goal(base)
@@ -797,7 +798,7 @@ class Dnf5Module(YumDnf):
         if self.module.check_mode:
             if results:
                 msg = "Check mode: No changes made, but would have if not in check mode"
-        else:
+        elif changed:
             transaction.download()
             if not self.download_only:
                 transaction.set_description("ansible dnf5 module")

ansible/modules/get_url.py

@@ -87,7 +87,7 @@ options:
       - 'If a checksum is passed to this parameter, the digest of the
         destination file will be calculated after it is downloaded to ensure
         its integrity and verify that the transfer completed successfully.
-        Format: <algorithm>:<checksum|url>, for example C(checksum="sha256:D98291AC[...]B6DC7B97",
+        Format: <algorithm>:<checksum|url>, for example C(checksum="sha256:D98291AC[...]B6DC7B97"),
         C(checksum="sha256:http://example.com/path/sha256sum.txt").'
       - If you worry about portability, only the sha1 algorithm is available
         on all platforms and python versions.

ansible/modules/git.py

@@ -317,11 +317,6 @@ remote_url_changed:
     returned: success
     type: bool
     sample: True
-warnings:
-    description: List of warnings if requested features were not available due to a too old git version.
-    returned: error
-    type: str
-    sample: git version is too old to fully support the depth argument. Falling back to full checkouts.
 git_dir_now:
     description: Contains the new path of .git directory if it is changed.
     returned: success
@@ -1240,7 +1235,7 @@ def main():
     archive_prefix = module.params['archive_prefix']
     separate_git_dir = module.params['separate_git_dir']
 
-    result = dict(changed=False, warnings=list())
+    result = dict(changed=False)
 
     if module.params['accept_hostkey']:
         if ssh_opts is not None:

ansible/modules/pip.py

@@ -814,10 +814,8 @@ def main():
         elif requirements:
             cmd.extend(['-r', requirements])
         else:
-            module.exit_json(
-                changed=False,
-                warnings=["No valid name or requirements file found."],
-            )
+            module.warn("No valid name or requirements file found.")
+            module.exit_json(changed=False)
 
         if module.check_mode:
             if extra_args or requirements or state == 'latest' or not name:

ansible/modules/sysvinit.py

@@ -88,9 +88,9 @@ EXAMPLES = """
 
 - name: Sleep for 5 seconds between stop and start command of badly behaving service
   ansible.builtin.sysvinit:
-    name: apache2
-    state: restarted
-    sleep: 5
+      name: apache2
+      state: restarted
+      sleep: 5
 
 - name: Make sure apache2 is started on runlevels 3 and 5
   ansible.builtin.sysvinit:

ansible/playbook/task.py

@@ -227,8 +227,6 @@ class Task(Base, Conditional, Taggable, CollectionSearch, Notifiable, Delegatabl
             raise AnsibleError("you must specify a value when using %s" % k, obj=ds)
         new_ds['loop_with'] = loop_name
         new_ds['loop'] = v
-        # display.deprecated("with_ type loops are being phased out, use the 'loop' keyword instead",
-        #                    version="2.10", collection_name='ansible.builtin')
 
     def preprocess_data(self, ds):
         """

ansible/plugins/__init__.py

@@ -20,24 +20,26 @@
 from __future__ import annotations
 
 import abc
+import functools
 import types
 import typing as t
 
 from ansible import constants as C
 from ansible.errors import AnsibleError
 from ansible.utils.display import Display
+from ansible.utils import display as _display
 
-from ansible.module_utils._internal import _plugin_exec_context
+from ansible.module_utils._internal import _plugin_info
 
 display = Display()
 
 if t.TYPE_CHECKING:
-    from .loader import PluginPathContext
+    from . import loader as _t_loader
 
 # Global so that all instances of a PluginLoader will share the caches
 MODULE_CACHE = {}  # type: dict[str, dict[str, types.ModuleType]]
-PATH_CACHE = {}  # type: dict[str, list[PluginPathContext] | None]
-PLUGIN_PATH_CACHE = {}  # type: dict[str, dict[str, dict[str, PluginPathContext]]]
+PATH_CACHE = {}  # type: dict[str, list[_t_loader.PluginPathContext] | None]
+PLUGIN_PATH_CACHE = {}  # type: dict[str, dict[str, dict[str, _t_loader.PluginPathContext]]]
 
 
 def get_plugin_class(obj):
@@ -50,10 +52,10 @@ def get_plugin_class(obj):
 class _ConfigurablePlugin(t.Protocol):
     """Protocol to provide type-safe access to config for plugin-related mixins."""
 
-    def get_option(self, option: str, hostvars: dict[str, object] | None = None) -> object: ...
+    def get_option(self, option: str, hostvars: dict[str, object] | None = None) -> t.Any: ...
 
 
-class _AnsiblePluginInfoMixin(_plugin_exec_context.HasPluginInfo):
+class _AnsiblePluginInfoMixin(_plugin_info.HasPluginInfo):
     """Mixin to provide type annotations and default values for existing PluginLoader-set load-time attrs."""
     _original_path: str | None = None
     _load_name: str | None = None
@@ -102,6 +104,14 @@ class AnsiblePlugin(_AnsiblePluginInfoMixin, _ConfigurablePlugin, metaclass=abc.
             raise KeyError(str(e))
         return option_value, origin
 
+    @functools.cached_property
+    def __plugin_info(self):
+        """
+        Internal cached property to retrieve `PluginInfo` for this plugin instance.
+        Only for use by the `AnsiblePlugin` base class.
+        """
+        return _plugin_info.get_plugin_info(self)
+
     def get_option(self, option, hostvars=None):
 
         if option not in self._options:
@@ -117,7 +127,7 @@ class AnsiblePlugin(_AnsiblePluginInfoMixin, _ConfigurablePlugin, metaclass=abc.
 
     def set_option(self, option, value):
         self._options[option] = C.config.get_config_value(option, plugin_type=self.plugin_type, plugin_name=self._load_name, direct={option: value})
-        C.handle_config_noise(display)
+        _display._report_config_warnings(self.__plugin_info)
 
     def set_options(self, task_keys=None, var_options=None, direct=None):
         """
@@ -134,7 +144,7 @@ class AnsiblePlugin(_AnsiblePluginInfoMixin, _ConfigurablePlugin, metaclass=abc.
         if self.allow_extras and var_options and '_extras' in var_options:
             # these are largely unvalidated passthroughs, either plugin or underlying API will validate
             self._options['_extras'] = var_options['_extras']
-        C.handle_config_noise(display)
+        _display._report_config_warnings(self.__plugin_info)
 
     def has_option(self, option):
         if not self._options:

ansible/plugins/action/__init__.py

@@ -318,13 +318,6 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
         final_environment: dict[str, t.Any] = {}
         self._compute_environment_string(final_environment)
 
-        # `modify_module` adapts PluginInfo to allow target-side use of `PluginExecContext` since modules aren't plugins
-        plugin = PluginInfo(
-            requested_name=module_name,
-            resolved_name=result.resolved_fqcn,
-            type='module',
-        )
-
         # modify_module will exit early if interpreter discovery is required; re-run after if necessary
         for _dummy in (1, 2):
             try:
@@ -338,7 +331,6 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
                     async_timeout=self._task.async_val,
                     environment=final_environment,
                     remote_is_local=bool(getattr(self._connection, '_remote_is_local', False)),
-                    plugin=plugin,
                     become_plugin=self._connection.become,
                 )
 
@@ -649,12 +641,12 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
         # done. Make the files +x if we're asked to, and return.
         if not self._is_become_unprivileged():
             if execute:
-                # Can't depend on the file being transferred with execute permissions.
+                # Can't depend on the file being transferred with required permissions.
                 # Only need user perms because no become was used here
-                res = self._remote_chmod(remote_paths, 'u+x')
+                res = self._remote_chmod(remote_paths, 'u+rwx')
                 if res['rc'] != 0:
                     raise AnsibleError(
-                        'Failed to set execute bit on remote files '
+                        'Failed to set permissions on remote files '
                         '(rc: {0}, err: {1})'.format(
                             res['rc'],
                             to_native(res['stderr'])))
@@ -695,10 +687,10 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
             return remote_paths
 
         # Step 3b: Set execute if we need to. We do this before anything else
-        # because some of the methods below might work but not let us set +x
-        # as part of them.
+        # because some of the methods below might work but not let us set
+        # permissions as part of them.
         if execute:
-            res = self._remote_chmod(remote_paths, 'u+x')
+            res = self._remote_chmod(remote_paths, 'u+rwx')
             if res['rc'] != 0:
                 raise AnsibleError(
                     'Failed to set file mode or acl on remote temporary files '
@@ -1010,7 +1002,7 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
         # tells the module to ignore options that are not in its argspec.
         module_args['_ansible_ignore_unknown_opts'] = ignore_unknown_opts
 
-        # allow user to insert string to add context to remote loggging
+        # allow user to insert string to add context to remote logging
         module_args['_ansible_target_log_info'] = C.config.get_config_value('TARGET_LOG_INFO', variables=task_vars)
 
         module_args['_ansible_tracebacks_for'] = _traceback.traceback_for()

ansible/plugins/action/gather_facts.py

@@ -28,10 +28,8 @@ class ActionModule(ActionBase):
 
             # TODO: remove in favor of controller side argspec detecting valid arguments
             # network facts modules must support gather_subset
-            try:
-                name = self._connection.ansible_name.removeprefix('ansible.netcommon.')
-            except AttributeError:
-                name = self._connection._load_name.split('.')[-1]
+            name = self._connection.ansible_name.removeprefix('ansible.netcommon.')
+
             if name not in ('network_cli', 'httpapi', 'netconf'):
                 subset = mod_args.pop('gather_subset', None)
                 if subset not in ('all', ['all'], None):

ansible/plugins/action/template.py

@@ -132,6 +132,9 @@ class ActionModule(ActionBase):
             data_templar = self._templar.copy_with_new_env(searchpath=searchpath, available_variables=temp_vars)
             resultant = data_templar.template(template_data, escape_backslashes=False, overrides=overrides)
 
+            if resultant is None:
+                resultant = ''
+
             new_task = self._task.copy()
             # mode is either the mode from task.args or the mode of the source file if the task.args
             # mode == 'preserve'

ansible/plugins/callback/oneline.py

@@ -17,6 +17,7 @@ from ansible import constants as C
 from ansible.plugins.callback import CallbackBase
 from ansible.template import Templar
 from ansible.executor.task_result import CallbackTaskResult
+from ansible.module_utils._internal import _deprecator
 
 
 class CallbackModule(CallbackBase):
@@ -32,7 +33,12 @@ class CallbackModule(CallbackBase):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self._display.deprecated('The oneline callback plugin is deprecated.', version='2.23')
+
+        self._display.deprecated(  # pylint: disable=ansible-deprecated-unnecessary-collection-name
+            msg='The oneline callback plugin is deprecated.',
+            version='2.23',
+            deprecator=_deprecator.ANSIBLE_CORE_DEPRECATOR,  # entire plugin being removed; this improves the messaging
+        )
 
     def _command_generic_msg(self, hostname, result, caption):
         stdout = result.get('stdout', '').replace('\n', '\\n').replace('\r', '\\r')

ansible/plugins/callback/tree.py

@@ -34,6 +34,7 @@ from ansible.executor.task_result import CallbackTaskResult
 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
+from ansible.module_utils._internal import _deprecator
 
 
 class CallbackModule(CallbackBase):
@@ -48,7 +49,12 @@ class CallbackModule(CallbackBase):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self._display.deprecated('The tree callback plugin is deprecated.', version='2.23')
+
+        self._display.deprecated(  # pylint: disable=ansible-deprecated-unnecessary-collection-name
+            msg='The tree callback plugin is deprecated.',
+            version='2.23',
+            deprecator=_deprecator.ANSIBLE_CORE_DEPRECATOR,  # entire plugin being removed; this improves the messaging
+        )
 
     def set_options(self, task_keys=None, var_options=None, direct=None):
         """ override to set self.tree """

ansible/plugins/connection/local.py

@@ -252,7 +252,7 @@ class Connection(ConnectionBase):
     def _become_success_timeout(self) -> int:
         """Timeout value for become success in seconds."""
         if (timeout := self.get_option('become_success_timeout')) < 1:
-            timeout = C.config.get_configuration_definitions('connection', 'local')['become_success_timeout']['default']
+            timeout = C.config.get_config_default('become_success_timeout', plugin_type='connection', plugin_name='local')
 
         return timeout
 

ansible/plugins/connection/paramiko_ssh.py

@@ -248,11 +248,13 @@ from ansible.errors import (
     AnsibleError,
     AnsibleFileNotFound,
 )
+
+from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.module_utils.compat.paramiko import _PARAMIKO_IMPORT_ERR as PARAMIKO_IMPORT_ERR, _paramiko as paramiko
 from ansible.plugins.connection import ConnectionBase
 from ansible.utils.display import Display
 from ansible.utils.path import makedirs_safe
-from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
+from ansible.module_utils._internal import _deprecator
 
 display = Display()
 
@@ -327,7 +329,12 @@ class Connection(ConnectionBase):
     _log_channel: str | None = None
 
     def __init__(self, *args, **kwargs):
-        display.deprecated('The paramiko connection plugin is deprecated.', version='2.21')
+        display.deprecated(  # pylint: disable=ansible-deprecated-unnecessary-collection-name
+            msg='The paramiko connection plugin is deprecated.',
+            version='2.21',
+            deprecator=_deprecator.ANSIBLE_CORE_DEPRECATOR,  # entire plugin being removed; this improves the messaging
+        )
+
         super().__init__(*args, **kwargs)
 
     def _cache_key(self) -> str:

ansible/plugins/doc_fragments/action_core.py

@@ -29,7 +29,7 @@ attributes:
       platforms: all
     until:
       description: Denotes if this action obeys until/retry/poll keywords
-      support: full
+      support: none
     tags:
       description: Allows for the 'tags' keyword to control the selection of this action for execution
       support: full

ansible/plugins/filter/core.py

@@ -115,7 +115,10 @@ def to_bool(value: object) -> bool:
     result = value_to_check == 1  # backwards compatibility with the old code which checked: value in ('yes', 'on', '1', 'true', 1)
 
     # NB: update the doc string to reflect reality once this fallback is removed
-    display.deprecated(f'The `bool` filter coerced invalid value {value!r} ({native_type_name(value)}) to {result!r}.', version='2.23')
+    display.deprecated(
+        msg=f'The `bool` filter coerced invalid value {value!r} ({native_type_name(value)}) to {result!r}.',
+        version='2.23',
+    )
 
     return result
 

ansible/plugins/inventory/__init__.py

@@ -28,7 +28,7 @@ from collections.abc import Mapping
 from ansible import template as _template
 from ansible.errors import AnsibleError, AnsibleParserError, AnsibleValueOmittedError
 from ansible.inventory.group import to_safe_group_name as original_safe
-from ansible.module_utils._internal import _plugin_exec_context
+from ansible.module_utils._internal import _plugin_info
 from ansible.parsing.utils.addresses import parse_address
 from ansible.parsing.dataloader import DataLoader
 from ansible.plugins import AnsiblePlugin, _ConfigurablePlugin
@@ -314,7 +314,7 @@ class BaseFileInventoryPlugin(_BaseInventoryPlugin):
         super(BaseFileInventoryPlugin, self).__init__()
 
 
-class Cacheable(_plugin_exec_context.HasPluginInfo, _ConfigurablePlugin):
+class Cacheable(_plugin_info.HasPluginInfo, _ConfigurablePlugin):
     """Mixin for inventory plugins which support caching."""
 
     _cache: CachePluginAdjudicator