ansible-core 2.19.4rc1__py3-none-any.whl → 2.20.0__py3-none-any.whl

ansible/plugins/action/script.py

@@ -139,8 +139,6 @@ class ActionModule(ActionBase):
             else:
                 script_cmd = ' '.join([env_string, target_command])
 
-            script_cmd = self._connection._shell.wrap_for_exec(script_cmd)
-
             exec_data = None
             # PowerShell runs the script in a special wrapper to enable things
             # like become and environment args
@@ -149,7 +147,7 @@ class ActionModule(ActionBase):
                 pc = self._task
                 exec_data = ps_manifest._create_powershell_wrapper(
                     name=f"ansible.builtin.script.{pathlib.Path(source).stem}",
-                    module_data=to_bytes(script_cmd),
+                    module_data=to_bytes(f"& {script_cmd}; exit $LASTEXITCODE"),
                     module_path=source,
                     module_args={},
                     environment=env_dict,

ansible/plugins/action/template.py

@@ -23,7 +23,6 @@ from ansible.config.manager import ensure_type
 from ansible.errors import AnsibleError, AnsibleActionFail
 from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native
 from ansible.module_utils.parsing.convert_bool import boolean
-from ansible.module_utils.six import string_types
 from ansible.plugins.action import ActionBase
 from ansible.template import trust_as_template
 from ansible._internal._templating import _template_vars
@@ -49,7 +48,7 @@ class ActionModule(ActionBase):
                        'block_end_string', 'comment_start_string', 'comment_end_string'):
             if s_type in self._task.args:
                 value = ensure_type(self._task.args[s_type], 'string')
-                if value is not None and not isinstance(value, string_types):
+                if value is not None and not isinstance(value, str):
                     raise AnsibleActionFail("%s is expected to be a string, but got %s instead" % (s_type, type(value)))
                 self._task.args[s_type] = value
 

ansible/plugins/action/uri.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import collections.abc as _c
 import os
+from copy import deepcopy
 
 from ansible.errors import AnsibleActionFail
 from ansible.module_utils.parsing.convert_bool import boolean
@@ -53,7 +54,8 @@ class ActionModule(ActionBase):
                     raise AnsibleActionFail(
                         'body must be mapping, cannot be type %s' % body.__class__.__name__
                     )
-                for field, value in body.items():
+                new_body = deepcopy(body)
+                for field, value in new_body.items():
                     if not isinstance(value, _c.MutableMapping):
                         continue
                     content = value.get('content')
@@ -70,7 +72,7 @@ class ActionModule(ActionBase):
                     value['filename'] = tmp_src
                     self._transfer_file(filename, tmp_src)
                     self._fixup_perms2((self._connection._shell.tmpdir, tmp_src))
-                kwargs['body'] = body
+                kwargs['body'] = new_body
 
             new_module_args = self._task.args | kwargs
 

ansible/plugins/cache/__init__.py

@@ -162,6 +162,7 @@ class BaseFileCacheModule(BaseCacheModule):
             except OSError as ex:
                 display.error_as_warning(f"Error in {self.plugin_name!r} cache plugin while trying to write to {tmpfile_path!r}.", exception=ex)
             try:
+                os.close(tmpfile_handle)  # os.rename fails if handle is still open in WSL
                 os.rename(tmpfile_path, cachefile)
                 os.chmod(cachefile, mode=S_IRWU_RG_RO)
             except OSError as ex:

ansible/plugins/callback/__init__.py

@@ -60,9 +60,6 @@ _YAML_BREAK_CHARS = '\n\x85\u2028\u2029'  # NL, NEL, LS, PS
 _SPACE_BREAK_RE = re.compile(fr' +([{_YAML_BREAK_CHARS}])')
 
 
-_T_callable = t.TypeVar("_T_callable", bound=t.Callable)
-
-
 class _AnsibleCallbackDumper(_dumper.AnsibleDumper):
     def __init__(self, *args, lossy: bool = False, **kwargs):
         super().__init__(*args, **kwargs)
@@ -293,7 +290,11 @@ class CallbackBase(AnsiblePlugin):
         )
 
         if not indent and any(indent_conditions):
-            indent = 4
+            try:
+                indent = self.get_option('result_indentation')
+            except KeyError:
+                # Callback does not declare result_indentation nor extend result_format_callback
+                indent = 4
         if pretty_results is False:
             # pretty_results=False overrides any specified indentation
             indent = None
@@ -394,8 +395,14 @@ class CallbackBase(AnsiblePlugin):
             # Callback does not declare pretty_results nor extend result_format_callback
             pretty_results = None
 
+        try:
+            indent = self.get_option('result_indentation')
+        except KeyError:
+            # Callback does not declare result_indentation nor extend result_format_callback
+            indent = 4
+
         if result_format == 'json':
-            return json.dumps(diff, sort_keys=True, indent=4, separators=(u',', u': ')) + u'\n'
+            return json.dumps(diff, sort_keys=True, indent=indent, separators=(u',', u': ')) + u'\n'
 
         if result_format == 'yaml':
             # None is a sentinel in this case that indicates default behavior
@@ -407,7 +414,7 @@ class CallbackBase(AnsiblePlugin):
                     allow_unicode=True,
                     Dumper=functools.partial(_AnsibleCallbackDumper, lossy=lossy),
                     default_flow_style=False,
-                    indent=4,
+                    indent=indent,
                     # sort_keys=sort_keys  # This requires PyYAML>=5.1
                 ),
                 '    '

ansible/plugins/connection/__init__.py

@@ -6,7 +6,6 @@ from __future__ import annotations
 
 import collections.abc as c
 import fcntl
-import io
 import os
 import shlex
 import typing as t
@@ -16,7 +15,7 @@ from functools import wraps
 
 from ansible import constants as C
 from ansible.errors import AnsibleValueOmittedError
-from ansible.module_utils.common.text.converters import to_bytes, to_text
+from ansible.module_utils.common.text.converters import to_text
 from ansible.playbook.play_context import PlayContext
 from ansible.plugins import AnsiblePlugin
 from ansible.plugins.become import BecomeBase
@@ -32,9 +31,6 @@ __all__ = ['ConnectionBase', 'ensure_connect']
 
 BUFSIZE = 65536
 
-P = t.ParamSpec('P')
-T = t.TypeVar('T')
-
 
 class ConnectionKwargs(t.TypedDict):
     task_uuid: str
@@ -42,7 +38,7 @@ class ConnectionKwargs(t.TypedDict):
     shell: t.NotRequired[ShellBase]
 
 
-def ensure_connect(
+def ensure_connect[T, **P](
     func: c.Callable[t.Concatenate[ConnectionBase, P], T],
 ) -> c.Callable[t.Concatenate[ConnectionBase, P], T]:
     @wraps(func)
@@ -135,7 +131,7 @@ class ConnectionBase(AnsiblePlugin):
         pass
 
     @abstractmethod
-    def _connect(self: T) -> T:
+    def _connect[T](self: T) -> T:
         """Connect to the host we've been initialized with"""
 
     @ensure_connect

ansible/plugins/connection/local.py

@@ -47,7 +47,6 @@ import typing as t
 
 import ansible.constants as C
 from ansible.errors import AnsibleError, AnsibleFileNotFound, AnsibleConnectionFailure
-from ansible.module_utils.six import text_type, binary_type
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.plugins.connection import ConnectionBase
 from ansible.utils.display import Display
@@ -100,7 +99,7 @@ class Connection(ConnectionBase):
         display.vvv(u"EXEC {0}".format(to_text(cmd)), host=self._play_context.remote_addr)
         display.debug("opening command with Popen()")
 
-        if isinstance(cmd, (text_type, binary_type)):
+        if isinstance(cmd, (str, bytes)):
             cmd = to_text(cmd)
         else:
             cmd = map(to_text, cmd)
@@ -119,7 +118,7 @@ class Connection(ConnectionBase):
 
         p = subprocess.Popen(
             cmd,
-            shell=isinstance(cmd, (text_type, binary_type)),
+            shell=isinstance(cmd, (str, bytes)),
             executable=executable,
             cwd=self.cwd,
             stdin=stdin,

ansible/plugins/connection/psrp.py

@@ -494,7 +494,6 @@ class Connection(ConnectionBase):
     def put_file(self, in_path: str, out_path: str) -> None:
         super(Connection, self).put_file(in_path, out_path)
 
-        out_path = self._shell._unquote(out_path)
         display.vvv("PUT %s TO %s" % (in_path, out_path), host=self._psrp_host)
 
         script, in_data = _bootstrap_powershell_script('psrp_put_file.ps1', {
@@ -554,7 +553,6 @@ class Connection(ConnectionBase):
         display.vvv("FETCH %s TO %s" % (in_path, out_path),
                     host=self._psrp_host)
 
-        in_path = self._shell._unquote(in_path)
         out_path = out_path.replace('\\', '/')
         b_out_path = to_bytes(out_path, errors='surrogate_or_strict')
 

ansible/plugins/connection/ssh.py

@@ -34,8 +34,6 @@ DOCUMENTATION = """
                - name: inventory_hostname
                - name: ansible_host
                - name: ansible_ssh_host
-               - name: delegated_vars['ansible_host']
-               - name: delegated_vars['ansible_ssh_host']
       host_key_checking:
           description: Determines if SSH should reject or not a connection after checking host keys.
           default: True
@@ -443,7 +441,6 @@ from ansible.errors import (
     AnsibleError,
     AnsibleFileNotFound,
 )
-from ansible.module_utils.six import text_type, binary_type
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.plugins.connection import ConnectionBase, BUFSIZE
 from ansible.plugins.shell.powershell import _replace_stderr_clixml
@@ -461,8 +458,6 @@ else:
 
 display = Display()
 
-P = t.ParamSpec('P')
-
 # error messages that indicate 255 return code is not from ssh itself.
 b_NOT_SSH_ERRORS = (b'Traceback (most recent call last):',  # Python-2.6 when there's an exception
                                                             #   while invoking a script via -m
@@ -549,7 +544,7 @@ def _handle_error(
         display.vvv(msg, host=host)
 
 
-def _ssh_retry(
+def _ssh_retry[**P](
     func: c.Callable[t.Concatenate[Connection, P], tuple[int, bytes, bytes]],
 ) -> c.Callable[t.Concatenate[Connection, P], tuple[int, bytes, bytes]]:
     """
@@ -1126,7 +1121,7 @@ class Connection(ConnectionBase):
 
         p = None
 
-        if isinstance(cmd, (text_type, binary_type)):
+        if isinstance(cmd, (str, bytes)):
             cmd = to_bytes(cmd)
         else:
             cmd = list(map(to_bytes, cmd))

ansible/plugins/connection/winrm.py

@@ -768,7 +768,6 @@ class Connection(ConnectionBase):
 
     def put_file(self, in_path: str, out_path: str) -> None:
         super(Connection, self).put_file(in_path, out_path)
-        out_path = self._shell._unquote(out_path)
         display.vvv('PUT "%s" TO "%s"' % (in_path, out_path), host=self._winrm_host)
         if not os.path.exists(to_bytes(in_path, errors='surrogate_or_strict')):
             raise AnsibleFileNotFound('file or module does not exist: "%s"' % to_native(in_path))
@@ -806,7 +805,6 @@ class Connection(ConnectionBase):
 
     def fetch_file(self, in_path: str, out_path: str) -> None:
         super(Connection, self).fetch_file(in_path, out_path)
-        in_path = self._shell._unquote(in_path)
         out_path = out_path.replace('\\', '/')
         # consistent with other connection plugins, we assume the caller has created the target dir
         display.vvv('FETCH "%s" TO "%s"' % (in_path, out_path), host=self._winrm_host)

ansible/plugins/doc_fragments/result_format_callback.py

@@ -26,6 +26,21 @@ class ModuleDocFragment(object):
             - json
             - yaml
         version_added: '2.13'
+      result_indentation:
+        name: Indentation of the result
+        description:
+          - Allows to configure indentation for YAML and verbose/pretty JSON.
+          - Please note that for O(result_format=yaml), only values between 2 and 9 will be handled as expected by PyYAML.
+            If indentation is set to 1, or to 10 or larger, the first level of indentation will be used,
+            but all further indentations will be by 2 spaces.
+        type: int
+        default: 4
+        env:
+          - name: ANSIBLE_CALLBACK_RESULT_INDENTATION
+        ini:
+          - key: callback_result_indentation
+            section: defaults
+        version_added: '2.20'
       pretty_results:
         name: Configure output for readability
         description:

ansible/plugins/filter/core.py

@@ -29,7 +29,6 @@ from ansible._internal._templating import _lazy_containers
 from ansible.errors import AnsibleFilterError, AnsibleTypeError, AnsibleTemplatePluginError
 from ansible.module_utils.datatag import native_type_name
 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.parsing.yaml.dumper import AnsibleDumper
@@ -279,7 +278,7 @@ def rand(environment, end, start=None, step=None, seed=None):
         r = SystemRandom()
     else:
         r = Random(seed)
-    if isinstance(end, integer_types):
+    if isinstance(end, int):
         if not start:
             start = 0
         if not step:
@@ -556,7 +555,7 @@ def subelements(obj, subelements, skip_missing=False):
 
     if isinstance(subelements, list):
         subelement_list = subelements[:]
-    elif isinstance(subelements, string_types):
+    elif isinstance(subelements, str):
         subelement_list = subelements.split('.')
     else:
         raise AnsibleTypeError('subelements must be a list or a string')
@@ -618,7 +617,7 @@ def list_of_dict_key_value_elements_to_dict(mylist, key_name='key', value_name='
 def path_join(paths):
     """ takes a sequence or a string, and return a concatenation
         of the different members """
-    if isinstance(paths, string_types):
+    if isinstance(paths, str):
         return os.path.join(paths)
     if is_sequence(paths):
         return os.path.join(*paths)
@@ -810,7 +809,7 @@ class FilterModule(object):
             'dict2items': dict_to_list_of_dict_key_value_elements,
             'items2dict': list_of_dict_key_value_elements_to_dict,
             'subelements': subelements,
-            'split': partial(unicode_wrap, text_type.split),
+            'split': partial(unicode_wrap, str.split),
             # FDI038 - replace this with a standard type compat shim
             'groupby': _cleansed_groupby,
 

ansible/plugins/filter/encryption.py

@@ -13,25 +13,13 @@ from ansible.utils.display import Display
 display = Display()
 
 
-def do_vault(data, secret, salt=None, vault_id='filter_default', wrap_object=False, vaultid=None):
+def do_vault(data, secret, salt=None, vault_id='filter_default', wrap_object=False):
     if not isinstance(secret, (str, bytes)):
         raise TypeError(f"Secret passed is required to be a string, instead we got {type(secret)}.")
 
     if not isinstance(data, (str, bytes)):
         raise TypeError(f"Can only vault strings, instead we got {type(data)}.")
 
-    if vaultid is not None:
-        display.deprecated(
-            msg="Use of undocumented `vaultid`.",
-            version="2.20",
-            help_text="Use `vault_id` instead.",
-        )
-
-        if vault_id == 'filter_default':
-            vault_id = vaultid
-        else:
-            display.warning("Ignoring vaultid as vault_id is already set.")
-
     vs = VaultSecret(to_bytes(secret))
     vl = VaultLib()
     try:
@@ -48,11 +36,11 @@ def do_vault(data, secret, salt=None, vault_id='filter_default', wrap_object=Fal
 
 
 @_template.accept_args_markers
-def do_unvault(vault, secret, vault_id='filter_default', vaultid=None):
+def do_unvault(vault, secret, vault_id='filter_default'):
     if isinstance(vault, VaultExceptionMarker):
         vault = vault._disarm()
 
-    if (first_marker := _template.get_first_marker_arg((vault, secret, vault_id, vaultid), {})) is not None:
+    if (first_marker := _template.get_first_marker_arg((vault, secret, vault_id), {})) is not None:
         return first_marker
 
     if not isinstance(secret, (str, bytes)):
@@ -61,18 +49,6 @@ def do_unvault(vault, secret, vault_id='filter_default', vaultid=None):
     if not isinstance(vault, (str, bytes)):
         raise TypeError(f"Vault should be in the form of a string, instead we got {type(vault)}.")
 
-    if vaultid is not None:
-        display.deprecated(
-            msg="Use of undocumented `vaultid`.",
-            version="2.20",
-            help_text="Use `vault_id` instead.",
-        )
-
-        if vault_id == 'filter_default':
-            vault_id = vaultid
-        else:
-            display.warning("Ignoring vaultid as vault_id is already set.")
-
     vs = VaultSecret(to_bytes(secret))
     vl = VaultLib([(vault_id, vs)])
 

ansible/plugins/filter/mathstuff.py

@@ -29,7 +29,6 @@ from jinja2.filters import pass_environment
 
 from ansible.errors import AnsibleError
 from ansible.module_utils.common.text import formatters
-from ansible.module_utils.six import binary_type, text_type
 from ansible.utils.display import Display
 
 try:
@@ -180,7 +179,7 @@ def rekey_on_member(data, key, duplicates='error'):
 
     if isinstance(data, Mapping):
         iterate_over = data.values()
-    elif isinstance(data, Iterable) and not isinstance(data, (text_type, binary_type)):
+    elif isinstance(data, Iterable) and not isinstance(data, (str, bytes)):
         iterate_over = data
     else:
         raise AnsibleError("Type is not a valid list, set, or dict")

ansible/plugins/filter/to_nice_yaml.yml

@@ -1,5 +1,5 @@
 DOCUMENTATION:
-  name: to_yaml
+  name: to_nice_yaml
   author: core team
   version_added: 'historical'
   short_description: Convert variable to YAML string
@@ -20,10 +20,38 @@ DOCUMENTATION:
       description: Affects sorting of dictionary keys.
       default: True
       type: bool
-    #default_style=None, canonical=None, width=None, line_break=None, encoding=None, explicit_start=None, explicit_end=None, version=None, tags=None
+    default_style:
+      description:
+        - Indicates the style of the scalar.
+      choices:
+        - ''
+        - "'"
+        - '"'
+        - '|'
+        - '>'
+      type: string
+    canonical:
+      description:
+        - If set to V(True), export tag type to the output.
+      type: bool
+    width:
+      description: Set the preferred line width.
+      type: int
+    line_break:
+      description: Specify the line break.
+      type: string
+    encoding:
+      description: Specify the output encoding.
+      type: string
+    explicit_start:
+      description: If set to V(True), adds an explicit start using "---".
+      type: bool
+    explicit_end:
+      description: If set to V(True), adds an explicit end using "...".
+      type: bool
   notes:
     - More options may be available, see L(PyYAML documentation, https://pyyaml.org/wiki/PyYAMLDocumentation) for details.
-    - 'These parameters to C(yaml.dump) will be ignored, as they are overridden internally: I(default_flow_style)'
+    - 'These parameters to C(yaml.dump) will be ignored, as they are overridden internally: I(default_flow_style), I(allow_unicode).'
 
 EXAMPLES: |
   # dump variable in a template to create a YAML document

ansible/plugins/filter/to_yaml.yml

@@ -20,21 +20,38 @@ DOCUMENTATION:
       description: Affects sorting of dictionary keys.
       default: True
       type: bool
+    default_style:
+      description:
+        - Indicates the style of the scalar.
+      choices:
+        - ''
+        - "'"
+        - '"'
+        - '|'
+        - '>'
+      type: string
+    canonical:
+      description:
+        - If set to V(True), export tag type to the output.
+      type: bool
+    width:
+      description: Set the preferred line width.
+      type: integer
+    line_break:
+      description: Specify the line break.
+      type: string
+    encoding:
+      description: Specify the output encoding.
+      type: string
+    explicit_start:
+      description: If set to V(True), adds an explicit start using "---".
+      type: bool
+    explicit_end:
+      description: If set to V(True), adds an explicit end using "...".
+      type: bool
   notes:
     - More options may be available, see L(PyYAML documentation, https://pyyaml.org/wiki/PyYAMLDocumentation) for details.
 
-    # TODO: find docs for these
-    #default_flow_style
-    #default_style
-    #canonical=None,
-    #width=None,
-    #line_break=None,
-    #encoding=None,
-    #explicit_start=None,
-    #explicit_end=None,
-    #version=None,
-    #tags=None
-
 EXAMPLES: |
   # dump variable in a template to create a YAML document
   {{ github_workflow | to_yaml }}

ansible/plugins/inventory/__init__.py

@@ -34,7 +34,6 @@ from ansible.parsing.dataloader import DataLoader
 from ansible.plugins import AnsiblePlugin, _ConfigurablePlugin
 from ansible.plugins.cache import CachePluginAdjudicator
 from ansible.module_utils.common.text.converters import to_bytes, to_native
-from ansible.module_utils.six import string_types
 from ansible.utils.display import Display
 from ansible.utils.vars import combine_vars, load_extra_vars
 
@@ -439,7 +438,7 @@ class Constructable(_BaseInventoryPlugin):
                         new_raw_group_names = []
                         if use_default:
                             new_raw_group_names.append(default_value_name)
-                        elif isinstance(key, string_types):
+                        elif isinstance(key, str):
                             new_raw_group_names.append(key)
                         elif isinstance(key, list):
                             for name in key:

ansible/plugins/inventory/toml.py

@@ -89,8 +89,6 @@ import tomllib
 from collections.abc import MutableMapping, MutableSequence
 
 from ansible.errors import AnsibleFileNotFound, AnsibleParserError
-from ansible.module_utils.common.text.converters import to_bytes, to_native
-from ansible.module_utils.six import string_types
 from ansible.plugins.inventory import BaseFileInventoryPlugin
 from ansible.utils.display import Display
 
@@ -147,11 +145,10 @@ class InventoryModule(BaseFileInventoryPlugin):
                 )
 
     def _load_file(self, file_name):
-        if not file_name or not isinstance(file_name, string_types):
-            raise AnsibleParserError("Invalid filename: '%s'" % to_native(file_name))
+        if not file_name or not isinstance(file_name, str):
+            raise AnsibleParserError("Invalid filename: '%s'" % file_name)
 
-        b_file_name = to_bytes(self.loader.path_dwim(file_name))
-        if not self.loader.path_exists(b_file_name):
+        if not self.loader.path_exists(file_name):
             raise AnsibleFileNotFound("Unable to retrieve file contents", file_name=file_name)
 
         try:

ansible/plugins/inventory/yaml.py

@@ -70,7 +70,6 @@ import os
 from collections.abc import MutableMapping
 
 from ansible.errors import AnsibleError, AnsibleParserError
-from ansible.module_utils.six import string_types
 from ansible.module_utils.common.text.converters import to_native, to_text
 from ansible.plugins.inventory import BaseFileInventoryPlugin
 
@@ -136,7 +135,7 @@ class InventoryModule(BaseFileInventoryPlugin):
                 for section in ['vars', 'children', 'hosts']:
                     if section in group_data:
                         # convert strings to dicts as these are allowed
-                        if isinstance(group_data[section], string_types):
+                        if isinstance(group_data[section], str):
                             group_data[section] = {group_data[section]: None}
 
                         if not isinstance(group_data[section], (MutableMapping, NoneType)):  # type: ignore[misc]

ansible/plugins/loader.py

@@ -27,7 +27,6 @@ from ansible import _internal, constants as C
 from ansible.errors import AnsibleError, AnsiblePluginCircularRedirect, AnsiblePluginRemovedError, AnsibleCollectionUnsupportedVersionError
 from ansible.module_utils.common.text.converters import to_bytes, to_text, to_native
 from ansible.module_utils.datatag import deprecator_from_collection_name
-from ansible.module_utils.six import string_types
 from ansible.parsing.yaml.loader import AnsibleLoader
 from ansible._internal._yaml._loader import AnsibleInstrumentedLoader
 from ansible.plugins import get_plugin_class, MODULE_CACHE, PATH_CACHE, PLUGIN_PATH_CACHE, AnsibleJinja2Plugin
@@ -97,7 +96,7 @@ def get_shell_plugin(shell_type=None, executable=None):
 
         # mostly for backwards compat
         if executable:
-            if isinstance(executable, string_types):
+            if isinstance(executable, str):
                 shell_filename = os.path.basename(executable)
                 try:
                     shell = shell_loader.get(shell_filename)
@@ -518,7 +517,7 @@ class PluginLoader:
                 #     filename, cn = find_plugin_docfile( name, type_name, self, [os.path.dirname(path)], C.YAML_DOC_EXTENSIONS)
 
                 if dstring:
-                    add_fragments(dstring, path, fragment_loader=fragment_loader, is_module=(type_name == 'module'))
+                    add_fragments(dstring, path, fragment_loader=fragment_loader, is_module=(type_name == 'module'), section='DOCUMENTATION')
 
                     if 'options' in dstring and isinstance(dstring['options'], dict):
                         C.config.initialize_plugin_configuration_definitions(type_name, name, dstring['options'])
@@ -1675,7 +1674,7 @@ def _configure_collection_loader(prefix_collections_path=None):
 
     # insert the internal ansible._protomatter collection up front
     paths = [os.path.dirname(_internal.__file__)] + list(prefix_collections_path) + C.COLLECTIONS_PATHS
-    finder = _AnsibleCollectionFinder(paths, C.COLLECTIONS_SCAN_SYS_PATH)
+    finder = _AnsibleCollectionFinder(paths, C.COLLECTIONS_SCAN_SYS_PATH, internal_collections=paths[0])
     finder._install()
 
     # this should succeed now

ansible/plugins/lookup/password.py

@@ -134,7 +134,6 @@ import hashlib
 
 from ansible.errors import AnsibleError, AnsibleAssertionError
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
-from ansible.module_utils.six import string_types
 from ansible.parsing.splitter import parse_kv
 from ansible.plugins.lookup import LookupBase
 from ansible.utils.encrypt import BaseHash, do_encrypt, random_password, random_salt
@@ -335,7 +334,7 @@ class LookupModule(LookupBase):
 
         # chars still might need more
         chars = params.get('chars', self.get_option('chars'))
-        if chars and isinstance(chars, string_types):
+        if chars and isinstance(chars, str):
             tmp_chars = []
             if u',,' in chars:
                 tmp_chars.append(u',')

ansible/plugins/lookup/subelements.py

@@ -83,7 +83,6 @@ _list:
 """
 
 from ansible.errors import AnsibleError
-from ansible.module_utils.six import string_types
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.plugins.lookup import LookupBase
 
@@ -104,7 +103,7 @@ class LookupModule(LookupBase):
             _raise_terms_error()
 
         # first term should be a list (or dict), second a string holding the subkey
-        if not isinstance(terms[0], (list, dict)) or not isinstance(terms[1], string_types):
+        if not isinstance(terms[0], (list, dict)) or not isinstance(terms[1], str):
             _raise_terms_error("first a dict or a list, second a string pointing to the subkey")
         subelements = terms[1].split(".")
 
@@ -122,7 +121,7 @@ class LookupModule(LookupBase):
         flags = {}
         if len(terms) == 3:
             flags = terms[2]
-        if not isinstance(flags, dict) and not all(isinstance(key, string_types) and key in FLAGS for key in flags):
+        if not isinstance(flags, dict) and not all(isinstance(key, str) and key in FLAGS for key in flags):
             _raise_terms_error("the optional third item must be a dict with flags %s" % FLAGS)
 
         # build_items

ansible/plugins/lookup/url.py

@@ -164,7 +164,7 @@ options:
     description:
       - SSL/TLS Ciphers to use for the request
       - 'When a list is provided, all ciphers are joined in order with C(:)'
-      - See the L(OpenSSL Cipher List Format,https://www.openssl.org/docs/manmaster/man1/openssl-ciphers.html#CIPHER-LIST-FORMAT)
+      - See the L(OpenSSL Cipher List Format,https://docs.openssl.org/master/man1/openssl-ciphers/#cipher-list-format)
         for more details.
       - The available ciphers is dependent on the Python and OpenSSL/LibreSSL versions
     type: list