ansible-core 2.19.2rc1__py3-none-any.whl → 2.20.0b1__py3-none-any.whl

ansible/plugins/action/__init__.py

@@ -29,7 +29,6 @@ from ansible.module_utils.common.arg_spec import ArgumentSpecValidator
 from ansible.module_utils.errors import UnsupportedError
 from ansible.module_utils.json_utils import _filter_non_json_lines
 from ansible.module_utils.common.json import Direction, get_module_encoder, get_module_decoder
-from ansible.module_utils.six import binary_type, string_types, text_type
 from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.release import __version__
 from ansible.utils.collection_loader import resource_from_fqcr
@@ -52,7 +51,7 @@ if t.TYPE_CHECKING:
 
 
 def _validate_utf8_json(d):
-    if isinstance(d, text_type):
+    if isinstance(d, str):
         # Purposefully not using to_bytes here for performance reasons
         d.encode(encoding='utf-8', errors='strict')
     elif isinstance(d, dict):
@@ -288,14 +287,6 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
                 elif leaf_module_name == 'async_status' and collection_name in rewrite_collection_names:
                     module_name = '%s.%s' % (win_collection, leaf_module_name)
 
-                # TODO: move this tweak down to the modules, not extensible here
-                # Remove extra quotes surrounding path parameters before sending to module.
-                if leaf_module_name in ['win_stat', 'win_file', 'win_copy', 'slurp'] and module_args and \
-                        hasattr(self._connection._shell, '_unquote'):
-                    for key in ('src', 'dest', 'path'):
-                        if key in module_args:
-                            module_args[key] = self._connection._shell._unquote(module_args[key])
-
             result = self._shared_loader_obj.module_loader.find_plugin_with_context(module_name, mod_type, collection_list=self._task.collections)
 
             if not result.resolved:
@@ -680,8 +671,18 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
             become_user,
             setfacl_mode)
 
-        if res['rc'] == 0:
-            return remote_paths
+        match res.get('rc'):
+            case 0:
+                return remote_paths
+            case 2:
+                # invalid syntax (for example, missing user, missing colon)
+                self._display.debug(f"setfacl command failed with an invalid syntax. Trying chmod instead. Err: {res!r}")
+            case 127:
+                # setfacl binary does not exists or we don't have permission to use it.
+                self._display.debug(f"setfacl binary does not exist or does not have permission to use it. Trying chmod instead. Err: {res!r}")
+            case _:
+                # generic debug message
+                self._display.debug(f'Failed to set facl {setfacl_mode}, got:{res!r}')
 
         # 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
@@ -874,7 +875,7 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
         # happens sometimes when it is a dir and not on bsd
         if 'checksum' not in mystat['stat']:
             mystat['stat']['checksum'] = ''
-        elif not isinstance(mystat['stat']['checksum'], string_types):
+        elif not isinstance(mystat['stat']['checksum'], str):
             raise AnsibleError("Invalid checksum returned by stat: expected a string type but got %s" % type(mystat['stat']['checksum']))
 
         return mystat['stat']
@@ -1084,7 +1085,7 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
                 # the remote system, which can be read and parsed by the module
                 args_data = ""
                 for k, v in module_args.items():
-                    args_data += '%s=%s ' % (k, shlex.quote(text_type(v)))
+                    args_data += '%s=%s ' % (k, shlex.quote(str(v)))
                 self._transfer_data(args_file_path, args_data)
             elif module_style in ('non_native_want_json', 'binary'):
                 profile_encoder = get_module_encoder(module_bits.serialization_profile, Direction.CONTROLLER_TO_MODULE)
@@ -1169,7 +1170,7 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
             self._cleanup_remote_tmp = False
 
         # NOTE: dnf returns results .. but that made it 'compatible' with squashing, so we allow mappings, for now
-        if 'results' in data and (not isinstance(data['results'], Sequence) or isinstance(data['results'], string_types)):
+        if 'results' in data and (not isinstance(data['results'], Sequence) or isinstance(data['results'], str)):
             data['ansible_module_results'] = data['results']
             del data['results']
             display.warning("Found internal 'results' key in module return, renamed to 'ansible_module_results'.")
@@ -1322,16 +1323,16 @@ class ActionBase(ABC, _AnsiblePluginInfoMixin):
 
         # stdout and stderr may be either a file-like or a bytes object.
         # Convert either one to a text type
-        if isinstance(stdout, binary_type):
+        if isinstance(stdout, bytes):
             out = to_text(stdout, errors=encoding_errors)
-        elif not isinstance(stdout, text_type):
+        elif not isinstance(stdout, str):
             out = to_text(b''.join(stdout.readlines()), errors=encoding_errors)
         else:
             out = stdout
 
-        if isinstance(stderr, binary_type):
+        if isinstance(stderr, bytes):
             err = to_text(stderr, errors=encoding_errors)
-        elif not isinstance(stderr, text_type):
+        elif not isinstance(stderr, str):
             err = to_text(b''.join(stderr.readlines()), errors=encoding_errors)
         else:
             err = stderr

ansible/plugins/action/add_host.py

@@ -21,7 +21,6 @@ from __future__ import annotations
 from collections.abc import Mapping
 
 from ansible.errors import AnsibleActionFail
-from ansible.module_utils.six import string_types
 from ansible.plugins.action import ActionBase
 from ansible.parsing.utils.addresses import parse_address
 from ansible.utils.display import Display
@@ -74,7 +73,7 @@ class ActionModule(ActionBase):
         if groups:
             if isinstance(groups, list):
                 group_list = groups
-            elif isinstance(groups, string_types):
+            elif isinstance(groups, str):
                 group_list = groups.split(",")
             else:
                 raise AnsibleActionFail("Groups must be specified as a list.", obj=groups)

ansible/plugins/action/fetch.py

@@ -20,7 +20,6 @@ import os
 import base64
 from ansible.errors import AnsibleConnectionFailure, AnsibleError, AnsibleActionFail, AnsibleActionSkip
 from ansible.module_utils.common.text.converters import to_bytes, to_text
-from ansible.module_utils.six import string_types
 from ansible.module_utils.parsing.convert_bool import boolean
 from ansible.plugins.action import ActionBase
 from ansible.utils.display import Display
@@ -52,10 +51,10 @@ class ActionModule(ActionBase):
 
             msg = ''
             # FIXME: validate source and dest are strings; use basic.py and module specs
-            if not isinstance(source, string_types):
+            if not isinstance(source, str):
                 msg = "Invalid type supplied for source option, it must be a string"
 
-            if not isinstance(dest, string_types):
+            if not isinstance(dest, str):
                 msg = "Invalid type supplied for dest option, it must be a string"
 
             if source is None or dest is None:
@@ -131,7 +130,6 @@ class ActionModule(ActionBase):
 
             # calculate the destination name
             if os.path.sep not in self._connection._shell.join_path('a', ''):
-                source = self._connection._shell._unquote(source)
                 source_local = source.replace('\\', '/')
             else:
                 source_local = source

ansible/plugins/action/group_by.py

@@ -17,7 +17,6 @@
 from __future__ import annotations
 
 from ansible.plugins.action import ActionBase
-from ansible.module_utils.six import string_types
 
 
 class ActionModule(ActionBase):
@@ -42,7 +41,7 @@ class ActionModule(ActionBase):
 
         group_name = self._task.args.get('key')
         parent_groups = self._task.args.get('parents', ['all'])
-        if isinstance(parent_groups, string_types):
+        if isinstance(parent_groups, str):
             parent_groups = [parent_groups]
 
         result['changed'] = False

ansible/plugins/action/include_vars.py

@@ -10,7 +10,6 @@ import pathlib
 import ansible.constants as C
 from ansible.errors import AnsibleError
 from ansible._internal._datatag._tags import SourceWasEncrypted
-from ansible.module_utils.six import string_types
 from ansible.module_utils.common.text.converters import to_native
 from ansible.plugins.action import ActionBase
 from ansible.utils.vars import combine_vars
@@ -38,14 +37,17 @@ class ActionModule(ActionBase):
         if not self.ignore_files:
             self.ignore_files = list()
 
-        if isinstance(self.ignore_files, string_types):
+        if isinstance(self.ignore_files, str):
+            self._display.deprecated(
+                msg="Specifying 'ignore_files' as a string is deprecated.",
+                version="2.24",
+                help_text="Use a list of strings instead.",
+                obj=self.ignore_files,
+            )
             self.ignore_files = self.ignore_files.split()
 
-        elif isinstance(self.ignore_files, dict):
-            return {
-                'failed': True,
-                'message': '{0} must be a list'.format(self.ignore_files)
-            }
+        if not isinstance(self.ignore_files, list):
+            raise AnsibleError("The 'ignore_files' option must be a list.", obj=self.ignore_files)
 
     def _set_args(self):
         """ Set instance variables based on the arguments that were passed """
@@ -65,11 +67,8 @@ class ActionModule(ActionBase):
         self.ignore_files = self._task.args.get('ignore_files', None)
         self.valid_extensions = self._task.args.get('extensions', self.VALID_FILE_EXTENSIONS)
 
-        # convert/validate extensions list
-        if isinstance(self.valid_extensions, string_types):
-            self.valid_extensions = list(self.valid_extensions)
         if not isinstance(self.valid_extensions, list):
-            raise AnsibleError('Invalid type for "extensions" option, it must be a list')
+            raise AnsibleError("The 'extensions' option must be a list.", obj=self.valid_extensions)
 
     def run(self, tmp=None, task_vars=None):
         """ Load yml files recursively from a directory.
@@ -93,10 +92,10 @@ class ActionModule(ActionBase):
             elif arg in self.VALID_ALL:
                 pass
             else:
-                raise AnsibleError('{0} is not a valid option in include_vars'.format(to_native(arg)))
+                raise AnsibleError(f'{arg} is not a valid option in include_vars', obj=arg)
 
         if dirs and files:
-            raise AnsibleError("You are mixing file only and dir only arguments, these are incompatible")
+            raise AnsibleError("You are mixing file only and dir only arguments, these are incompatible", obj=self._task.args)
 
         # set internal vars from args
         self._set_args()
@@ -108,13 +107,13 @@ class ActionModule(ActionBase):
             self._set_root_dir()
             if not path.exists(self.source_dir):
                 failed = True
-                err_msg = ('{0} directory does not exist'.format(to_native(self.source_dir)))
+                err_msg = f"{self.source_dir} directory does not exist"
             elif not path.isdir(self.source_dir):
                 failed = True
-                err_msg = ('{0} is not a directory'.format(to_native(self.source_dir)))
+                err_msg = f"{self.source_dir} is not a directory"
             else:
                 for root_dir, filenames in self._traverse_dir_depth():
-                    failed, err_msg, updated_results = (self._load_files_in_dir(root_dir, filenames))
+                    failed, err_msg, updated_results = self._load_files_in_dir(root_dir, filenames)
                     if failed:
                         break
                     results.update(updated_results)
@@ -175,7 +174,7 @@ class ActionModule(ActionBase):
                 self.source_dir = path.join(current_dir, self.source_dir)
 
     def _log_walk(self, error):
-        self._display.vvv('Issue with walking through "%s": %s' % (to_native(error.filename), to_native(error)))
+        self._display.vvv(f"Issue with walking through {error.filename}: {error}")
 
     def _traverse_dir_depth(self):
         """ Recursively iterate over a directory and sort the files in
@@ -204,9 +203,8 @@ class ActionModule(ActionBase):
             try:
                 if re.search(r'{0}$'.format(file_type), filename):
                     return True
-            except Exception:
-                err_msg = 'Invalid regular expression: {0}'.format(file_type)
-                raise AnsibleError(err_msg)
+            except Exception as ex:
+                raise AnsibleError(f'Invalid regular expression: {file_type!r}', obj=file_type) from ex
         return False
 
     def _is_valid_file_ext(self, source_file):
@@ -232,7 +230,7 @@ class ActionModule(ActionBase):
         err_msg = ''
         if validate_extensions and not self._is_valid_file_ext(filename):
             failed = True
-            err_msg = ('{0} does not have a valid extension: {1}'.format(to_native(filename), ', '.join(self.valid_extensions)))
+            err_msg = f"{filename!r} does not have a valid extension: {', '.join(self.valid_extensions)}"
         else:
             data = self._loader.load_from_file(filename, cache='none', trusted_as_template=True)
 
@@ -243,7 +241,7 @@ class ActionModule(ActionBase):
 
             if not isinstance(data, dict):
                 failed = True
-                err_msg = ('{0} must be stored as a dictionary/hash'.format(to_native(filename)))
+                err_msg = f"{filename!r} must be stored as a dictionary/hash"
             else:
                 self.included_files.append(filename)
                 results.update(data)

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

@@ -489,7 +489,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', {
@@ -549,7 +548,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,