ansible-core 2.20.0b1__py3-none-any.whl → 2.20.0b2__py3-none-any.whl

ansible/cli/doc.py

@@ -236,7 +236,9 @@ class RoleMixin(object):
         b_colldirs = list_collection_dirs(coll_filter=collection_filter)
         for b_path in b_colldirs:
             path = to_text(b_path, errors='surrogate_or_strict')
-            collname = _get_collection_name_from_path(b_path)
+            if not (collname := _get_collection_name_from_path(b_path)):
+                display.debug(f'Skipping invalid path {b_path!r}')
+                continue
 
             roles_dir = os.path.join(path, 'roles')
             if os.path.exists(roles_dir):

ansible/collections/list.py

@@ -17,8 +17,10 @@ def list_collections(coll_filter=None, search_paths=None, dedupe=True, artifacts
 
     collections = {}
     for candidate in list_collection_dirs(search_paths=search_paths, coll_filter=coll_filter, artifacts_manager=artifacts_manager, dedupe=dedupe):
-        collection = _get_collection_name_from_path(candidate)
-        collections[collection] = candidate
+        if collection := _get_collection_name_from_path(candidate):
+            collections[collection] = candidate
+        else:
+            display.debug(f'Skipping invalid collection in path: {candidate!r}')
     return collections
 
 

ansible/galaxy/dependency_resolution/providers.py

@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 
+import collections.abc as _c
 import functools
 import typing as t
 
@@ -37,16 +38,16 @@ except ImportError:
 
 
 # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
-RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
+RESOLVELIB_LOWERBOUND = SemanticVersion("0.8.0")
 RESOLVELIB_UPPERBOUND = SemanticVersion("2.0.0")
 RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
 
 
-class CollectionDependencyProviderBase(AbstractProvider):
+class CollectionDependencyProvider(AbstractProvider):
     """Delegate providing a requirement interface for the resolver."""
 
     def __init__(
-            self,  # type: CollectionDependencyProviderBase
+            self,
             apis,  # type: MultiGalaxyAPIProxy
             concrete_artifacts_manager=None,  # type: ConcreteArtifactsManager
             preferred_candidates=None,  # type: t.Iterable[Candidate]
@@ -102,8 +103,14 @@ class CollectionDependencyProviderBase(AbstractProvider):
         """
         return requirement_or_candidate.canonical_package_id
 
-    def get_preference(self, *args, **kwargs):
-        # type: (t.Any, t.Any) -> t.Union[float, int]
+    def get_preference(
+        self,
+        identifier: str,
+        resolutions: _c.Mapping[str, Candidate],
+        candidates: _c.Mapping[str, _c.Iterator[Candidate]],
+        information: _c.Iterator[t.NamedTuple],
+        backtrack_causes: _c.Sequence,
+    ) -> float | int:
         """Return sort key function return value for given requirement.
 
         This result should be based on preference that is defined as
@@ -111,38 +118,6 @@ class CollectionDependencyProviderBase(AbstractProvider):
         The lower the return value is, the more preferred this
         group of arguments is.
 
-        resolvelib >=0.5.3, <0.7.0
-
-        :param resolution: Currently pinned candidate, or ``None``.
-
-        :param candidates: A list of possible candidates.
-
-        :param information: A list of requirement information.
-
-        Each ``information`` instance is a named tuple with two entries:
-
-          * ``requirement`` specifies a requirement contributing to
-            the current candidate list
-
-          * ``parent`` specifies the candidate that provides
-            (depended on) the requirement, or `None`
-            to indicate a root requirement.
-
-        resolvelib >=0.7.0, < 0.8.0
-
-        :param identifier: The value returned by ``identify()``.
-
-        :param resolutions: Mapping of identifier, candidate pairs.
-
-        :param candidates: Possible candidates for the identifier.
-            Mapping of identifier, list of candidate pairs.
-
-        :param information: Requirement information of each package.
-            Mapping of identifier, list of named tuple pairs.
-            The named tuples have the entries ``requirement`` and ``parent``.
-
-        resolvelib >=0.8.0, <= 1.0.1
-
         :param identifier: The value returned by ``identify()``.
 
         :param resolutions: Mapping of identifier, candidate pairs.
@@ -178,10 +153,6 @@ class CollectionDependencyProviderBase(AbstractProvider):
         the value is, the more preferred this requirement is (i.e. the
         sorting function is called with ``reverse=False``).
         """
-        raise NotImplementedError
-
-    def _get_preference(self, candidates):
-        # type: (list[Candidate]) -> t.Union[float, int]
         if any(
                 candidate in self._preferred_candidates
                 for candidate in candidates
@@ -191,8 +162,12 @@ class CollectionDependencyProviderBase(AbstractProvider):
             return float('-inf')
         return len(candidates)
 
-    def find_matches(self, *args, **kwargs):
-        # type: (t.Any, t.Any) -> list[Candidate]
+    def find_matches(
+        self,
+        identifier: str,
+        requirements: _c.Mapping[str, _c.Iterator[Requirement]],
+        incompatibilities: _c.Mapping[str, _c.Iterator[Candidate]],
+    ) -> list[Candidate]:
         r"""Find all possible candidates satisfying given requirements.
 
         This tries to get candidates based on the requirements' types.
@@ -203,32 +178,13 @@ class CollectionDependencyProviderBase(AbstractProvider):
         For a "named" requirement, Galaxy-compatible APIs are consulted
         to find concrete candidates for this requirement. If there's a
         pre-installed candidate, it's prepended in front of others.
-
-        resolvelib >=0.5.3, <0.6.0
-
-        :param requirements: A collection of requirements which all of \
-                             the returned candidates must match. \
-                             All requirements are guaranteed to have \
-                             the same identifier. \
-                             The collection is never empty.
-
-        resolvelib >=0.6.0
-
-        :param identifier: The value returned by ``identify()``.
-
-        :param requirements: The requirements all returned candidates must satisfy.
-            Mapping of identifier, iterator of requirement pairs.
-
-        :param incompatibilities: Incompatible versions that must be excluded
-            from the returned list.
-
-        :returns: An iterable that orders candidates by preference, \
-                  e.g. the most preferred candidate comes first.
         """
-        raise NotImplementedError
+        return [
+            match for match in self._find_matches(list(requirements[identifier]))
+            if not any(match.ver == incompat.ver for incompat in incompatibilities[identifier])
+        ]
 
-    def _find_matches(self, requirements):
-        # type: (list[Requirement]) -> list[Candidate]
+    def _find_matches(self, requirements: list[Requirement]) -> list[Candidate]:
         # FIXME: The first requirement may be a Git repo followed by
         # FIXME: its cloned tmp dir. Using only the first one creates
         # FIXME: loops that prevent any further dependency exploration.
@@ -456,52 +412,3 @@ class CollectionDependencyProviderBase(AbstractProvider):
             self._make_req_from_dict({'name': dep_name, 'version': dep_req})
             for dep_name, dep_req in req_map.items()
         ]
-
-
-# Classes to handle resolvelib API changes between minor versions for 0.X
-class CollectionDependencyProvider050(CollectionDependencyProviderBase):
-    def find_matches(self, requirements):  # type: ignore[override]
-        # type: (list[Requirement]) -> list[Candidate]
-        return self._find_matches(requirements)
-
-    def get_preference(self, resolution, candidates, information):  # type: ignore[override]
-        # type: (t.Optional[Candidate], list[Candidate], list[t.NamedTuple]) -> t.Union[float, int]
-        return self._get_preference(candidates)
-
-
-class CollectionDependencyProvider060(CollectionDependencyProviderBase):
-    def find_matches(self, identifier, requirements, incompatibilities):  # type: ignore[override]
-        # type: (str, t.Mapping[str, t.Iterator[Requirement]], t.Mapping[str, t.Iterator[Requirement]]) -> list[Candidate]
-        return [
-            match for match in self._find_matches(list(requirements[identifier]))
-            if not any(match.ver == incompat.ver for incompat in incompatibilities[identifier])
-        ]
-
-    def get_preference(self, resolution, candidates, information):  # type: ignore[override]
-        # type: (t.Optional[Candidate], list[Candidate], list[t.NamedTuple]) -> t.Union[float, int]
-        return self._get_preference(candidates)
-
-
-class CollectionDependencyProvider070(CollectionDependencyProvider060):
-    def get_preference(self, identifier, resolutions, candidates, information):  # type: ignore[override]
-        # type: (str, t.Mapping[str, Candidate], t.Mapping[str, t.Iterator[Candidate]], t.Iterator[t.NamedTuple]) -> t.Union[float, int]
-        return self._get_preference(list(candidates[identifier]))
-
-
-class CollectionDependencyProvider080(CollectionDependencyProvider060):
-    def get_preference(self, identifier, resolutions, candidates, information, backtrack_causes):  # type: ignore[override]
-        # type: (str, t.Mapping[str, Candidate], t.Mapping[str, t.Iterator[Candidate]], t.Iterator[t.NamedTuple], t.Sequence) -> t.Union[float, int]
-        return self._get_preference(list(candidates[identifier]))
-
-
-def _get_provider():  # type () -> CollectionDependencyProviderBase
-    if RESOLVELIB_VERSION >= SemanticVersion("0.8.0"):
-        return CollectionDependencyProvider080
-    if RESOLVELIB_VERSION >= SemanticVersion("0.7.0"):
-        return CollectionDependencyProvider070
-    if RESOLVELIB_VERSION >= SemanticVersion("0.6.0"):
-        return CollectionDependencyProvider060
-    return CollectionDependencyProvider050
-
-
-CollectionDependencyProvider = _get_provider()

ansible/module_utils/ansible_release.py

@@ -17,6 +17,6 @@
 
 from __future__ import annotations
 
-__version__ = '2.20.0b1'
+__version__ = '2.20.0b2'
 __author__ = 'Ansible, Inc.'
 __codename__ = "Good Times Bad Times"

ansible/module_utils/six/__init__.py

@@ -33,6 +33,14 @@ import operator
 import sys
 import types
 
+from ansible.module_utils.common import warnings as _warnings
+
+_warnings.deprecate(
+    msg="The `ansible.module_utils.six` module is deprecated.",
+    help_text="Use the Python standard library equivalent instead.",
+    version="2.24",
+)
+
 # The following makes it easier for us to script updates of the bundled code. It is not part of
 # upstream six
 _BUNDLED_METADATA = {"pypi_name": "six", "version": "1.17.0"}

ansible/modules/known_hosts.py

@@ -225,7 +225,13 @@ def sanity_check(module, host, key, sshkeygen):
         rc, stdout, stderr = module.run_command(sshkeygen_command)
 
     if stdout == '':  # host not found
-        module.fail_json(msg="Host parameter does not match hashed host field in supplied key")
+        results = {
+            "msg": "Host parameter does not match hashed host field in supplied key",
+            "rc": rc,
+        }
+        if stderr:
+            results["stderr"] = stderr
+        module.fail_json(**results)
 
 
 def search_for_host_key(module, host, key, path, sshkeygen):

ansible/parsing/dataloader.py

@@ -54,7 +54,7 @@ class DataLoader:
 
     def __init__(self) -> None:
 
-        self._basedir: str = '.'
+        self._basedir: str = os.path.abspath('.')
 
         # NOTE: not effective with forks as the main copy does not get updated.
         # avoids rereading files
@@ -227,7 +227,7 @@ class DataLoader:
 
     def set_basedir(self, basedir: str) -> None:
         """ sets the base directory, used to find files when a relative path is given """
-        self._basedir = basedir
+        self._basedir = os.path.abspath(basedir)
 
     def path_dwim(self, given: str) -> str:
         """

ansible/playbook/block.py

@@ -17,7 +17,6 @@
 
 from __future__ import annotations
 
-import ansible.constants as C
 from ansible.errors import AnsibleParserError
 from ansible.module_utils.common.sentinel import Sentinel
 from ansible.playbook.attribute import NonInheritableFieldAttribute
@@ -316,8 +315,7 @@ class Block(Base, Conditional, CollectionSearch, Taggable, Notifiable, Delegatab
                     filtered_block = evaluate_block(task)
                     if filtered_block.has_tasks():
                         tmp_list.append(filtered_block)
-                elif ((task.action in C._ACTION_META and task.implicit) or
-                        task.evaluate_tags(self._play.only_tags, self._play.skip_tags, all_vars=all_vars)):
+                elif task.evaluate_tags(self._play.only_tags, self._play.skip_tags, all_vars=all_vars):
                     tmp_list.append(task)
             return tmp_list
 

ansible/playbook/helpers.py

@@ -165,17 +165,29 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h
                     subdir = 'tasks'
                     if use_handlers:
                         subdir = 'handlers'
+                    try:
+                        include_target = templar.template(task.args['_raw_params'])
+                    except AnsibleUndefinedVariable as ex:
+                        raise AnsibleParserError(
+                            message=f"Error when evaluating variable in import path {task.args['_raw_params']!r}.",
+                            help_text="When using static imports, ensure that any variables used in their names are defined in vars/vars_files\n"
+                                      "or extra-vars passed in from the command line. Static imports cannot use variables from facts or inventory\n"
+                                      "sources like group or host vars.",
+                            obj=task_ds,
+                        ) from ex
+                    # FIXME this appears to be (almost?) duplicate code as in IncludedFile for include_tasks
                     while parent_include is not None:
                         if not isinstance(parent_include, TaskInclude):
                             parent_include = parent_include._parent
                             continue
-                        parent_include.post_validate(templar=templar)
-                        parent_include_dir = os.path.dirname(parent_include.args.get('_raw_params'))
+                        if isinstance(parent_include, IncludeRole):
+                            parent_include_dir = parent_include._role_path
+                        else:
+                            parent_include_dir = os.path.dirname(templar.template(parent_include.args.get('_raw_params')))
                         if cumulative_path is None:
                             cumulative_path = parent_include_dir
                         elif not os.path.isabs(cumulative_path):
                             cumulative_path = os.path.join(parent_include_dir, cumulative_path)
-                        include_target = templar.template(task.args['_raw_params'])
                         if task._role:
                             new_basedir = os.path.join(task._role._role_path, subdir, cumulative_path)
                             include_file = loader.path_dwim_relative(new_basedir, subdir, include_target)
@@ -189,16 +201,6 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h
                             parent_include = parent_include._parent
 
                     if not found:
-                        try:
-                            include_target = templar.template(task.args['_raw_params'])
-                        except AnsibleUndefinedVariable as ex:
-                            raise AnsibleParserError(
-                                message=f"Error when evaluating variable in import path {task.args['_raw_params']!r}.",
-                                help_text="When using static imports, ensure that any variables used in their names are defined in vars/vars_files\n"
-                                "or extra-vars passed in from the command line. Static imports cannot use variables from facts or inventory\n"
-                                "sources like group or host vars.",
-                                obj=task_ds,
-                            ) from ex
                         if task._role:
                             include_file = loader.path_dwim_relative(task._role._role_path, subdir, include_target)
                         else:

ansible/playbook/play.py

@@ -314,19 +314,9 @@ class Play(Base, Taggable, CollectionSearch):
         t.args['_raw_params'] = 'flush_handlers'
         t.implicit = True
         t.set_loader(self._loader)
+        t.tags = ['always']
 
-        if self.tags:
-            # Avoid calling flush_handlers in case the whole play is skipped on tags,
-            # this could be performance improvement since calling flush_handlers on
-            # large inventories could be expensive even if no hosts are notified
-            # since we call flush_handlers per host.
-            # Block.filter_tagged_tasks ignores evaluating tags on implicit meta
-            # tasks so we need to explicitly call Task.evaluate_tags here.
-            t.tags = self.tags
-            if t.evaluate_tags(self.only_tags, self.skip_tags, all_vars=self.vars):
-                flush_block.block = [t]
-        else:
-            flush_block.block = [t]
+        flush_block.block = [t]
 
         # NOTE keep flush_handlers tasks even if a section has no regular tasks,
         #      there may be notified handlers from the previous section

ansible/plugins/action/fetch.py

@@ -192,7 +192,7 @@ class ActionModule(ActionBase):
                                        msg="checksum mismatch", file=source, dest=dest, remote_md5sum=None,
                                        checksum=new_checksum, remote_checksum=remote_checksum))
                 else:
-                    result.update({'changed': True, 'md5sum': new_md5, 'dest': dest,
+                    result.update({'changed': True, 'md5sum': new_md5, 'file': source, 'dest': dest,
                                    'remote_md5sum': None, 'checksum': new_checksum,
                                    'remote_checksum': remote_checksum})
             else:

ansible/plugins/test/falsy.yml

@@ -5,7 +5,7 @@ DOCUMENTATION:
   short_description: Pythonic false
   description:
     - This check is a more Python version of what is 'false'.
-    - It is the opposite of 'truthy'.
+    - It is the opposite of P(ansible.builtin.truthy#test).
   options:
     _input:
       description: An expression that can be expressed in a boolean context.

ansible/plugins/test/truthy.yml

@@ -20,5 +20,5 @@ EXAMPLES: |
     thisisfalse: '{{ "" is truthy }}'
 RETURN:
   _value:
-    description: Returns V(True) if the condition is not "Python truthy", V(False) otherwise.
+    description: Returns V(True) if the condition is "Python truthy", V(False) otherwise.
     type: boolean

ansible/release.py

@@ -17,6 +17,6 @@
 
 from __future__ import annotations
 
-__version__ = '2.20.0b1'
+__version__ = '2.20.0b2'
 __author__ = 'Ansible, Inc.'
 __codename__ = "Good Times Bad Times"

ansible/vars/manager.py

@@ -17,7 +17,6 @@
 
 from __future__ import annotations
 
-import os
 import sys
 import typing as t
 
@@ -447,7 +446,7 @@ class VariableManager:
         """
 
         variables = {}
-        variables['playbook_dir'] = os.path.abspath(self._loader.get_basedir())
+        variables['playbook_dir'] = self._loader.get_basedir()
         variables['ansible_playbook_python'] = sys.executable
         variables['ansible_config_file'] = C.CONFIG_FILE
 

{ansible_core-2.20.0b1.dist-info → ansible_core-2.20.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ansible-core
-Version: 2.20.0b1
+Version: 2.20.0b2
 Summary: Radically simple IT automation
 Author: Ansible Project
 Project-URL: Homepage, https://ansible.com/

{ansible_core-2.20.0b1.dist-info → ansible_core-2.20.0b2.dist-info}/RECORD

@@ -3,7 +3,7 @@ ansible/__main__.py,sha256=24j-7-YT4lZ2fmV80JD-VRoYBnxR7YoP_VP-orJtDt0,796
 ansible/constants.py,sha256=qef45QpHi-yFFMvllvNKmqFpXdKKr304e5fEZnjgwZc,7989
 ansible/context.py,sha256=oKYyfjfWpy8vDeProtqfnqSmuij_t75_5e5t0U_hQ1g,1933
 ansible/keyword_desc.yml,sha256=i3d_5dCS8Qsy5DNyrZnPHupkFnj6U3onpgEe2VqS8AY,7273
-ansible/release.py,sha256=wUvJBk_SBCP7irI_l9VPFYGdvh4LlahAq3hpr_7hwzg,842
+ansible/release.py,sha256=MHD1PthxmFO6BBW8FDGHrx_D_sBABtICDeMysD2xoE0,842
 ansible/_internal/__init__.py,sha256=pLZlT_Cm_fKBKDcWB5g0KZt2XWKZGlC7sfytkuUTbJU,2186
 ansible/_internal/_collection_proxy.py,sha256=Dm7iePwbX9fHPCYsadPLek47eiYSJSQkfcmSWHI8kr8,1154
 ansible/_internal/_display_utils.py,sha256=2dOknOQpt_GW2AkoMUJxPvmQUCAVYv911KwX6Dwrh0c,5651
@@ -80,7 +80,7 @@ ansible/cli/_ssh_askpass.py,sha256=fKYjoUkAxh1slpKm969wtJxX78zXe57bgLtQDhxMk_Y,2
 ansible/cli/adhoc.py,sha256=ybYB9k6KsT2126E7My7lkOGFOIm2i0yF1FdY5MYtujg,8326
 ansible/cli/config.py,sha256=3lHmiX-pOI4lM7jnMPpLU1-xiOc76JWSXnVvVZelHLk,28512
 ansible/cli/console.py,sha256=F9jL6C3LTZBBD_0OIanGyM86PfxCSAe-gcvv7bqmt58,22002
-ansible/cli/doc.py,sha256=tjCFkv0K4GPYyE1q8BsZbZbV8QOoF4x5DKHLSDkqnW8,72974
+ansible/cli/doc.py,sha256=7y1IJfNJbfJKeGNJJi5pzZDjrkj2raAMhnxQLAvszCg,73077
 ansible/cli/galaxy.py,sha256=nSRvhTJnYmrf6OvSnJV-uqw3w9I0d-HRIxHiS9A6HSE,94348
 ansible/cli/inventory.py,sha256=F5vifIv1t_wOLDSY9B3giSpS-876pKIXXwHE_ISET30,15983
 ansible/cli/playbook.py,sha256=F8v8t4v2dIpSVOlLb2RtvoHC3MraKjPbq1j01OOrQrA,10480
@@ -91,7 +91,7 @@ ansible/cli/arguments/option_helpers.py,sha256=BO_yCmofRJRuaVQXVmfiLHfaEJaKkoiMP
 ansible/cli/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible/cli/scripts/ansible_connection_cli_stub.py,sha256=LVRkDIrsgL_72dJ7ZzZVn6On9u_SASNsh-tgCog8ZxU,13121
 ansible/collections/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ansible/collections/list.py,sha256=PhQU6f7-bieg892uWnSg_8Cg4etbDnQUbR5a6SOnydk,2873
+ansible/collections/list.py,sha256=kRYyW0UUu2Js5UuDW_pELrU3pQMPHSOW0hUXVA6b7-8,2977
 ansible/compat/__init__.py,sha256=CvyoCuJ9EdeWO3_nj5fBSQ495YP0tCbXhQ6cramBdGY,1002
 ansible/compat/importlib_resources.py,sha256=75SJApiBzBKuBDknj81vdfzSJSxc2Pi4YvgQkmmGtew,542
 ansible/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -200,7 +200,7 @@ ansible/galaxy/data/network/vars/main.yml.j2,sha256=3I4QQOFgSN3CSJ2C1qRFPeRVv23S
 ansible/galaxy/dependency_resolution/__init__.py,sha256=_0Ss541x_EPocg1b_arUpqFpchADtfQwiAw-1B7nqEE,1996
 ansible/galaxy/dependency_resolution/dataclasses.py,sha256=HjBvJjq9dn60CBnyPzJEELi80J28SXZtQu4syN6ealk,24024
 ansible/galaxy/dependency_resolution/errors.py,sha256=t9RSyjCNaeB9ipzW_UmZA96SDHlMh0v5IsqbN1L_LQ4,697
-ansible/galaxy/dependency_resolution/providers.py,sha256=lv2wCBXPmhsXXDvfbudn_KxDbrH0ZK2ouVzkfjV1PnE,23359
+ansible/galaxy/dependency_resolution/providers.py,sha256=fCw7Wg14NLC80M-v6wpPKbzsw6pQWuz0jsfysOsFHn8,19124
 ansible/galaxy/dependency_resolution/reporters.py,sha256=HKYT0lf6sihCQ2EheYD07m6mZ5P69l1pLYBjx8Vhk-k,3389
 ansible/galaxy/dependency_resolution/resolvers.py,sha256=NUtKTwIBMegoMkfhbxKA_COF0bSsXMCLkp8cqI0ZKGA,623
 ansible/galaxy/dependency_resolution/versioning.py,sha256=QIpRw4anhAhXFFWbRyALIrCBRgwvX7SMgDDw4sEhJQU,1726
@@ -212,7 +212,7 @@ ansible/inventory/host.py,sha256=cZw906LeMYe6oF3ZxW6K2HWoW2Qc0jxHssg_C8cRumE,493
 ansible/inventory/manager.py,sha256=IiODOOpm5iGpAHn5Sjap-_XTX0pZsXrQCevEaFNF_Sc,31743
 ansible/module_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible/module_utils/_text.py,sha256=MjBVvIttHxQbicW6EY9F0B7GTbhjyiVDNt92fCZnQOw,1207
-ansible/module_utils/ansible_release.py,sha256=wUvJBk_SBCP7irI_l9VPFYGdvh4LlahAq3hpr_7hwzg,842
+ansible/module_utils/ansible_release.py,sha256=MHD1PthxmFO6BBW8FDGHrx_D_sBABtICDeMysD2xoE0,842
 ansible/module_utils/api.py,sha256=8BmCzQtp9rClsLGlDn4I9iJrUFLCdnoEIxYX59_IL9c,5756
 ansible/module_utils/basic.py,sha256=GsM5pubhLqRjdXE21LxdbbzOgRDrQm6a9bJ-_-kHHSI,90082
 ansible/module_utils/connection.py,sha256=5RE7BmO58yvutG4Z1sVNsb1Km9ea1hA37HRcPuSJxFA,7575
@@ -387,7 +387,7 @@ ansible/module_utils/powershell/Ansible.ModuleUtils.PrivilegeUtil.psm1,sha256=1u
 ansible/module_utils/powershell/Ansible.ModuleUtils.SID.psm1,sha256=TX70j9dlg_SGVcb2HrHxakrkZzsyxPtaIeKaRevgy54,3639
 ansible/module_utils/powershell/Ansible.ModuleUtils.WebRequest.psm1,sha256=4Wb0K_GO8maVpQYpdDBrUvl7YgkReeunXSNM1N6nq74,19182
 ansible/module_utils/powershell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ansible/module_utils/six/__init__.py,sha256=R8WpTF9a4x8RcBnCbS4StADOgbh-sCncsQkvQdik78w,35132
+ansible/module_utils/six/__init__.py,sha256=j2dk0uS3NrLLJ-4VhBQ8sO7Uep7kt3FE9q1v293nDlo,35372
 ansible/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible/modules/add_host.py,sha256=VZ3gc-phY5myzGijo6AIB1omD9ykfWpoqRvzleZp3DU,3859
 ansible/modules/apt.py,sha256=267kolDkjiXbO80Oum2wrM96pQQJLHk3NROTe2fCF8w,63056
@@ -426,7 +426,7 @@ ansible/modules/include_role.py,sha256=9FWEwk09DT0ucD6OOMPOS1i6jkllJOn7gkzJkRg8v
 ansible/modules/include_tasks.py,sha256=SrEIkzv7o01GXmRsXmWHhaNJcHiqN9qXZeDsNAhHuo4,2659
 ansible/modules/include_vars.py,sha256=JplpZJT9d4nKPUbKYSlPOh1_huyZuaSmpt-z4i2olx0,6730
 ansible/modules/iptables.py,sha256=94iDMuVpx3Qq52cJaUW0dxZO3FE8cvs4op8t7nsvNm8,35494
-ansible/modules/known_hosts.py,sha256=672GEOal1uEVn0P6uCs4U4wZmEYJasBLJFTNsROEJOM,14313
+ansible/modules/known_hosts.py,sha256=4mZFUKtNuvTT60cf_XV7P6DjyX-K5IO5RhKHaE8Tqc0,14449
 ansible/modules/lineinfile.py,sha256=x0nR7uJ5B28Ckap_Yo_3zMabc742jXj59Dk9qF616dQ,23595
 ansible/modules/meta.py,sha256=0oLfvydcj8XeZsRR8yoRzgTINaPsEfl3-jxp1T-lzDM,7264
 ansible/modules/mount_facts.py,sha256=vy9Eeu17_EMsJbxgc23pa7DDXwU8rg11WFJTqcLjMXo,26018
@@ -463,7 +463,7 @@ ansible/modules/wait_for_connection.py,sha256=U7yQEXyWnrTGpaBAfMF1KFQpg3ZhX4QjZd
 ansible/modules/yum_repository.py,sha256=3kV5z7nTdLWuYPKT292aj-p8Z4UXwaSKxcXzQktUUkU,23852
 ansible/parsing/__init__.py,sha256=NMP9ZkK59SNdQktw76aWAXVAm5U2POXLgAK7wH-1h0g,742
 ansible/parsing/ajson.py,sha256=nv82WTeWYuKdy4LE_YM6nhLR7eb-Tyr4F6arjTP8nmY,692
-ansible/parsing/dataloader.py,sha256=GuES1WHbl9c8NIqVe8uwWOPurU5GiGrdwWDqftj6Rl4,22331
+ansible/parsing/dataloader.py,sha256=2znBPFGXFcYKuTCDJ48so9JMsYc1kBN_HV2PixSDQqI,22365
 ansible/parsing/mod_args.py,sha256=5-JzLXH1sW9XxyeZgNOEqWt8_I6cPl2C9VwZQ_3z1K8,15090
 ansible/parsing/plugin_docs.py,sha256=UYWDpLCF4FrBU0lxgR6C2bkoa7N8TBplh4KcW-B6enk,6326
 ansible/parsing/quoting.py,sha256=myYxG625XK6rgNULbBuKp23G2R83c0UilrF1ZImDjGs,1057
@@ -480,17 +480,17 @@ ansible/parsing/yaml/objects.py,sha256=muP81NhLvhJAh9MZ5UTUp8AMUTkTKM4Pk-xl6gOeV
 ansible/playbook/__init__.py,sha256=5FKnJsBz35UvBbwyiLrniAwkdse8jTRzjOrI0RLU05E,4766
 ansible/playbook/attribute.py,sha256=kAWselKvFurdGC0EaKJLh8b9y7IWChZwXG648aH6S-4,7800
 ansible/playbook/base.py,sha256=DL_jvJQ_E21xkyLsZrUxOEUQ0DyQ3XafKo57icx797Y,33809
-ansible/playbook/block.py,sha256=nfs8xAkjSLcgIgYfxFr-rpYWbocSswM5ROey8kvBHdU,14492
+ansible/playbook/block.py,sha256=SkEwtHHFGI3gadaF9YhuXH5vjsfwwK5TNqFuayGwD_Y,14383
 ansible/playbook/collectionsearch.py,sha256=GO3tuBSKVeMnfp1xGtGSdHRZzk3eYMhL_zYVCLVcqYA,1828
 ansible/playbook/conditional.py,sha256=oq0Adm8LwibKuBC0LTk1TsQcqS1ZwPjSQuM2FUeip8g,1317
 ansible/playbook/delegatable.py,sha256=BBcw2GU85V7ome7qX0KRg-vZyjv2J890kEHjYQOyoTk,625
 ansible/playbook/handler.py,sha256=2LItktoUgVDejUeoxOJbUqjob8INJFALq6FAUSFEzOE,2735
 ansible/playbook/handler_task_include.py,sha256=kCrBThzmIRWKaecLl9UNB8VBvtVPI0dt8eHpBldsnlY,1391
-ansible/playbook/helpers.py,sha256=xMaOK-5Q_lIqrewu-UU3vLH214MaTgXWoH-XRPexjMc,14699
+ansible/playbook/helpers.py,sha256=FAKTvIb99W8JRBBuK_kJCnd3UP-U_YmiLYTzHrd9j-4,14829
 ansible/playbook/included_file.py,sha256=WgPV0H0f4V11nauyQC5u_gPiWWuocMEHGU7vgR3qbWg,12027
 ansible/playbook/loop_control.py,sha256=5rZz6aWXpvvwOD4CzrS_b_cnXIu4Gf56czkomX1NS7w,2022
 ansible/playbook/notifiable.py,sha256=MQz4VZuOga35VLcdUxVd9FQVzFg-djtQZhs09DS2juA,299
-ansible/playbook/play.py,sha256=0I_kEb6xpcCyKjPGpWAnYQ2PLXDnHosKSN4ZwaLfTDQ,20206
+ansible/playbook/play.py,sha256=KiKImFJfJIZoWpjpJu_2LKq8Sk3RtWDBUTpcRglU6LE,19579
 ansible/playbook/play_context.py,sha256=nfluy9HF2bI-LoFCNImpE33EGN_L5Zx8rmvIzVtzrlM,13847
 ansible/playbook/playbook_include.py,sha256=zTzEsS20DB9hSzRfU9DI4-BsteHwzWVshUF_SoIVVE0,5515
 ansible/playbook/role_include.py,sha256=MZd0EnPjQstRg0-AZBso1iCT8Vr9vThAwyBXeaHpjPg,7551
@@ -515,7 +515,7 @@ ansible/plugins/action/copy.py,sha256=dq8wGc83xYyRc9X887QnOJxdRAt0rB2-NJQxuxowCl
 ansible/plugins/action/debug.py,sha256=KPWtGEPbc119_e1rNQztCB-wzelJObAv16qJNHPUNb4,3604
 ansible/plugins/action/dnf.py,sha256=2ObzxBLRPBPy2JCp3wWRzR1fIEHzhS5y34CoAzTXqN0,3664
 ansible/plugins/action/fail.py,sha256=MzIefYaHaRdpjgnqc9eNge0P32btlTPzO6TB22jkadk,1457
-ansible/plugins/action/fetch.py,sha256=V3VoY_TQtPz348hdc3FQyjWJdiKPoykDQ2aPV-0cbdo,10031
+ansible/plugins/action/fetch.py,sha256=4lNe-55Fy1Ph33m26xLLn6OfYqsRE5nBBKSz0v2jG0s,10047
 ansible/plugins/action/gather_facts.py,sha256=vr-3BJiBDP25aJd9e1uydpS3r8Np2T6nubUbYAls58w,9109
 ansible/plugins/action/group_by.py,sha256=O1PfwBJ4wLyE0BMOhhSfx8tlTYQHT1V-_ZZDD6ShE3Q,1835
 ansible/plugins/action/include_vars.py,sha256=tYsdXiV-NGBJkJ_uhS5Rybp7HJ9_X6Iz_2Ug9ZbZ44A,11436
@@ -710,7 +710,7 @@ ansible/plugins/test/directory.yml,sha256=UpHBKTYTqusESrl9PA5lyhhIdoMXke6sf_1z5n
 ansible/plugins/test/exists.yml,sha256=R8lteO8uYy-XelgK7nK3U_sTUDz0DrTO2BAUr8ltgrM,885
 ansible/plugins/test/failed.yml,sha256=lTzQSd0r-SZn2y_ifWO4eszPWd72oea8fCl44p7erA0,803
 ansible/plugins/test/failure.yml,sha256=lTzQSd0r-SZn2y_ifWO4eszPWd72oea8fCl44p7erA0,803
-ansible/plugins/test/falsy.yml,sha256=SFzc-DA00IVrZ0qhf170YVq9eU14gw67cm7Gp062ns4,801
+ansible/plugins/test/falsy.yml,sha256=zoK1YNP94tRd0mDHinoZn4a0ODMZiBFVjiKEAU6L0BU,823
 ansible/plugins/test/file.yml,sha256=_yCsLZH8jHhbEwOyI_X4DxYixut6i7oRHaeZWltH50c,651
 ansible/plugins/test/files.py,sha256=YvdrNZ23EOKIttRBiwThij4sPgbFvgOvgc2Uw9RiMM4,1407
 ansible/plugins/test/finished.yml,sha256=tJ5NDBpiuk-VVq0-Q1CHVi4vI0eZjzT9o43iU5HJvgo,702
@@ -742,7 +742,7 @@ ansible/plugins/test/success.yml,sha256=YCWf9SYePHlqhffTkKEVUOXWMMlYWDDVGdypw9gn
 ansible/plugins/test/successful.yml,sha256=YCWf9SYePHlqhffTkKEVUOXWMMlYWDDVGdypw9gngjk,691
 ansible/plugins/test/superset.yml,sha256=KcPyWv-MqREe_hgKdilPJjOJ1O7hGgHLLZEfvEg1Cd8,714
 ansible/plugins/test/timedout.yml,sha256=w-QWRd_nJqY9oE4ypd6Eyi4oc12ngIDZJBICBvWossU,594
-ansible/plugins/test/truthy.yml,sha256=Flgl3QawsSbBYK24d1ciSSmrUCJwnWRdt8YIOI9uyLw,810
+ansible/plugins/test/truthy.yml,sha256=sSGai78h38UtaHd21WiqdhbKb4XmuzijviMJSvu5KD4,806
 ansible/plugins/test/unreachable.yml,sha256=KCrtQULh4YZ3iOZiE0-_SGCCpqnjIDf3n5Go5w5d58k,695
 ansible/plugins/test/uri.py,sha256=j1WZU7eCfNEu3m2udzVTP8nIbJ6TFsG3DmO62FIosM4,965
 ansible/plugins/test/uri.yml,sha256=jqb-Ppm-uQfOh-XgTm6iW8dxW1s2NvFpHBsPBsWEMzM,1115
@@ -787,15 +787,15 @@ ansible/utils/collection_loader/_collection_meta.py,sha256=p2eZArsO8RCl4PlN1x2I-
 ansible/vars/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible/vars/clean.py,sha256=5YwNY0ERBr29vQsdncjKSesLwB_Ku7SNk46edkiCXsM,5959
 ansible/vars/hostvars.py,sha256=cRK_4dssUwIN4aDxxYXEj7KzTazrykQ4PbJotne5oJc,4364
-ansible/vars/manager.py,sha256=HOeJyEQewOoObJ_HLArrud1p55cieEcjK-cHUIbGHE4,28333
+ansible/vars/manager.py,sha256=bsh_Ie5qSPxySkpxtz37n3uXaPcC4bDbDHN8tcSf4xo,28306
 ansible/vars/plugins.py,sha256=Ry0wY-Y7lMlQgowItFngE6EjP_6sFcUEjvS0tGocweg,3127
 ansible/vars/reserved.py,sha256=NgxlMBm_tloqDVb5TEX4eGhpYsz_AO6-Fmyi3kJpIFk,3107
-ansible_core-2.20.0b1.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ansible_core-2.20.0b1.dist-info/licenses/licenses/Apache-License.txt,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
-ansible_core-2.20.0b1.dist-info/licenses/licenses/BSD-3-Clause.txt,sha256=la0N3fE3Se8vBiuvUcFKA8b-E41G7flTic6P8CkUroE,1548
-ansible_core-2.20.0b1.dist-info/licenses/licenses/MIT-license.txt,sha256=jLXp2XurnyZKbye40g9tfmLGtVlxh3pPD4n8xNqX8xc,1023
-ansible_core-2.20.0b1.dist-info/licenses/licenses/PSF-license.txt,sha256=g7BC_H1qyg8Q1o5F76Vrm8ChSWYI5-dyj-CdGlNKBUo,2484
-ansible_core-2.20.0b1.dist-info/licenses/licenses/simplified_bsd.txt,sha256=8R5R7R7sOa0h1Fi6RNgFgHowHBfun-OVOMzJ4rKAk2w,1237
+ansible_core-2.20.0b2.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ansible_core-2.20.0b2.dist-info/licenses/licenses/Apache-License.txt,sha256=y16Ofl9KOYjhBjwULGDcLfdWBfTEZRXnduOspt-XbhQ,11325
+ansible_core-2.20.0b2.dist-info/licenses/licenses/BSD-3-Clause.txt,sha256=la0N3fE3Se8vBiuvUcFKA8b-E41G7flTic6P8CkUroE,1548
+ansible_core-2.20.0b2.dist-info/licenses/licenses/MIT-license.txt,sha256=jLXp2XurnyZKbye40g9tfmLGtVlxh3pPD4n8xNqX8xc,1023
+ansible_core-2.20.0b2.dist-info/licenses/licenses/PSF-license.txt,sha256=g7BC_H1qyg8Q1o5F76Vrm8ChSWYI5-dyj-CdGlNKBUo,2484
+ansible_core-2.20.0b2.dist-info/licenses/licenses/simplified_bsd.txt,sha256=8R5R7R7sOa0h1Fi6RNgFgHowHBfun-OVOMzJ4rKAk2w,1237
 ansible_test/__init__.py,sha256=20VPOj11c6Ut1Av9RaurgwJvFhMqkWG3vAvcCbecNKw,66
 ansible_test/_data/ansible.cfg,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansible_test/_data/coveragerc,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -1044,7 +1044,7 @@ ansible_test/_util/controller/sanity/pylint/plugins/deprecated_calls.py,sha256=3
 ansible_test/_util/controller/sanity/pylint/plugins/deprecated_comment.py,sha256=tmQf_-2VAT2GVfwa9X9ruBcaj0Sz6Ifx4cXmdzJ99SQ,5226
 ansible_test/_util/controller/sanity/pylint/plugins/hide_unraisable.py,sha256=s0AIoK03uqZSTwXSLvd4oXvf4WJ0Ckol5ingitHoMr4,836
 ansible_test/_util/controller/sanity/pylint/plugins/string_format.py,sha256=Mb1Mx8WS4RulsORFgyctlFRR0Sn-PYPy4mVu_GYCD18,2359
-ansible_test/_util/controller/sanity/pylint/plugins/unwanted.py,sha256=W07F44GcL46H2CBytsaqQGld7Yh5JOEgffFkAokPy6g,8255
+ansible_test/_util/controller/sanity/pylint/plugins/unwanted.py,sha256=Xq8ThjQTlO1OkdZl59tIJeGm1GIHYFa1WZYugSQxxNM,8710
 ansible_test/_util/controller/sanity/shellcheck/exclude.txt,sha256=8U3ZTe1A1YRCXUB1AIAIgcd33ejBhzelBPkVdOJnhj8,21
 ansible_test/_util/controller/sanity/validate-modules/validate.py,sha256=jpNOhA5qJ5LdlWlSOJoJyTUh9H1tepjcSYZXeHdhJRY,114
 ansible_test/_util/controller/sanity/validate-modules/validate_modules/__init__.py,sha256=CRUAj-k-zJye4RAGZ8eR9HvP6weM6VKTwGmFYpI_0Bw,816
@@ -1091,8 +1091,8 @@ ansible_test/config/cloud-config-vultr.ini.template,sha256=XLKHk3lg_8ReQMdWfZzhh
 ansible_test/config/config.yml,sha256=1zdGucnIl6nIecZA7ISIANvqXiHWqq6Dthsk_6MUwNc,2642
 ansible_test/config/inventory.networking.template,sha256=bFNSk8zNQOaZ_twaflrY0XZ9mLwUbRLuNT0BdIFwvn4,1335
 ansible_test/config/inventory.winrm.template,sha256=1QU8W-GFLnYEw8yY9bVIvUAVvJYPM3hyoijf6-M7T00,1098
-ansible_core-2.20.0b1.dist-info/METADATA,sha256=CToFpmZgU9mpQ4FLnmo2Qh4cA4TMoCqv-yJwC3MEQdY,7732
-ansible_core-2.20.0b1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ansible_core-2.20.0b1.dist-info/entry_points.txt,sha256=S9yJij5Im6FgRQxzkqSCnPQokC7PcWrDW_NSygZczJU,451
-ansible_core-2.20.0b1.dist-info/top_level.txt,sha256=IFbRLjAvih1DYzJWg3_F6t4sCzEMxRO7TOMNs6GkYHo,21
-ansible_core-2.20.0b1.dist-info/RECORD,,
+ansible_core-2.20.0b2.dist-info/METADATA,sha256=9EZQhLa0qNtDowW4jyvDRJReTtejQWpWvZHZjJxSmME,7732
+ansible_core-2.20.0b2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ansible_core-2.20.0b2.dist-info/entry_points.txt,sha256=S9yJij5Im6FgRQxzkqSCnPQokC7PcWrDW_NSygZczJU,451
+ansible_core-2.20.0b2.dist-info/top_level.txt,sha256=IFbRLjAvih1DYzJWg3_F6t4sCzEMxRO7TOMNs6GkYHo,21
+ansible_core-2.20.0b2.dist-info/RECORD,,

ansible_test/_util/controller/sanity/pylint/plugins/unwanted.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import functools
 import os
 import typing as t
 
@@ -108,10 +109,6 @@ class AnsibleUnwantedChecker(BaseChecker):
                 'Iterator',
             )
         ),
-
-        'ansible.module_utils.six': UnwantedEntry(
-            'the Python standard library equivalent'
-        ),
     }
 
     unwanted_functions = {
@@ -136,6 +133,19 @@ class AnsibleUnwantedChecker(BaseChecker):
                                         modules_only=True),
     }
 
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        # ansible.module_utils.six is deprecated and collections can still use it until it is removed
+        if self.is_ansible_core:
+            self.unwanted_imports['ansible.module_utils.six'] = UnwantedEntry(
+                'the Python standard library equivalent'
+            )
+
+    @functools.cached_property
+    def is_ansible_core(self) -> bool:
+        """True if ansible-core is being tested."""
+        return not self.linter.config.collection_name
+
     def visit_import(self, node):  # type: (astroid.node_classes.Import) -> None
         """Visit an import node."""
         for name in node.names: