ansible-core 2.19.0b3__py3-none-any.whl → 2.19.0b5__py3-none-any.whl

ansible/module_utils/facts/virtual/linux.py

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

ansible/module_utils/parsing/convert_bool.py

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

ansible/module_utils/service.py

@@ -36,7 +36,7 @@ import select
 import shlex
 import subprocess
 
-from ansible.module_utils.six import PY2, b
+from ansible.module_utils.six import b
 from ansible.module_utils.common.text.converters import to_bytes, to_text
 
 
@@ -187,12 +187,8 @@ def daemonize(module, cmd):
     if pid == 0:
         os.close(pipe[0])
 
-        # if command is string deal with  py2 vs py3 conversions for shlex
         if not isinstance(cmd, list):
-            if PY2:
-                cmd = shlex.split(to_bytes(cmd, errors=errors))
-            else:
-                cmd = shlex.split(to_text(cmd, errors=errors))
+            cmd = shlex.split(to_text(cmd, errors=errors))
 
         # make sure we always use byte strings
         run_cmd = []
@@ -247,9 +243,6 @@ def daemonize(module, cmd):
                     break
                 return_data += to_bytes(data, errors=errors)
 
-        # Note: no need to specify encoding on py3 as this module sends the
-        # pickle to itself (thus same python interpreter so we aren't mixing
-        # py2 and py3)
         return pickle.loads(to_bytes(return_data, errors=errors))
 
 

ansible/modules/apt_repository.py

@@ -88,8 +88,8 @@ options:
         description:
             - Whether to automatically try to install the Python apt library or not, if it is not already installed.
               Without this library, the module does not work.
-            - Runs C(apt-get install python-apt) for Python 2, and C(apt-get install python3-apt) for Python 3.
-            - Only works with the system Python 2 or Python 3. If you are using a Python on the remote that is not
+            - Runs C(apt-get install python3-apt).
+            - Only works with the system Python. If you are using a Python on the remote that is not
               the system Python, set O(install_python_apt=false) and ensure that the Python apt library
               for your Python version is installed some other way.
         type: bool
@@ -98,8 +98,7 @@ author:
 - Alexander Saltanov (@sashka)
 version_added: "0.7"
 requirements:
-   - python-apt (python 2)
-   - python3-apt (python 3)
+   - python3-apt
    - apt-key or gpg
 """
 
@@ -232,14 +231,15 @@ class SourcesList(object):
         self.files_mapping = {}  # internal DS for tracking symlinks
         # Repositories that we're adding -- used to implement mode param
         self.new_repos = set()
-        self.default_file = self._apt_cfg_file('Dir::Etc::sourcelist')
+        self.default_file = apt_pkg.config.find_file('Dir::Etc::sourcelist')
 
         # read sources.list if it exists
         if os.path.isfile(self.default_file):
             self.load(self.default_file)
 
         # read sources.list.d
-        for file in glob.iglob('%s/*.list' % self._apt_cfg_dir('Dir::Etc::sourceparts')):
+        self.sources_dir = apt_pkg.config.find_dir('Dir::Etc::sourceparts')
+        for file in glob.iglob(f'{self.sources_dir}/*.list'):
             if os.path.islink(file):
                 self.files_mapping[file] = os.readlink(file)
             self.load(file)
@@ -255,7 +255,7 @@ class SourcesList(object):
         if '/' in filename:
             return filename
         else:
-            return os.path.abspath(os.path.join(self._apt_cfg_dir('Dir::Etc::sourceparts'), filename))
+            return os.path.abspath(os.path.join(self.sources_dir, filename))
 
     def _suggest_filename(self, line):
         def _cleanup_filename(s):
@@ -313,28 +313,6 @@ class SourcesList(object):
 
         return valid, enabled, source, comment
 
-    @staticmethod
-    def _apt_cfg_file(filespec):
-        """
-        Wrapper for `apt_pkg` module for running with Python 2.5
-        """
-        try:
-            result = apt_pkg.config.find_file(filespec)
-        except AttributeError:
-            result = apt_pkg.Config.FindFile(filespec)
-        return result
-
-    @staticmethod
-    def _apt_cfg_dir(dirspec):
-        """
-        Wrapper for `apt_pkg` module for running with Python 2.5
-        """
-        try:
-            result = apt_pkg.config.find_dir(dirspec)
-        except AttributeError:
-            result = apt_pkg.Config.FindDir(dirspec)
-        return result
-
     def load(self, file):
         group = []
         f = open(file, 'r')

ansible/modules/assemble.py

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

ansible/modules/async_status.py

@@ -28,6 +28,8 @@ options:
     type: str
     choices: [ cleanup, status ]
     default: status
+notes:
+  - The RV(started) and RV(finished) return values were updated to return V(True) or V(False) instead of V(1) or V(0) in ansible-core 2.19.
 extends_documentation_fragment:
 - action_common_attributes
 - action_common_attributes.flow
@@ -85,15 +87,15 @@ ansible_job_id:
   type: str
   sample: '360874038559.4169'
 finished:
-  description: Whether the asynchronous job has finished (V(1)) or not (V(0))
+  description: Whether the asynchronous job has finished or not
   returned: always
-  type: int
-  sample: 1
+  type: bool
+  sample: true
 started:
-  description: Whether the asynchronous job has started (V(1)) or not (V(0))
+  description: Whether the asynchronous job has started or not
   returned: always
-  type: int
-  sample: 1
+  type: bool
+  sample: true
 stdout:
   description: Any output returned by async_wrapper
   returned: always
@@ -134,7 +136,7 @@ def main():
     log_path = os.path.join(async_dir, jid)
 
     if not os.path.exists(log_path):
-        module.fail_json(msg="could not find job", ansible_job_id=jid, started=1, finished=1)
+        module.fail_json(msg="could not find job", ansible_job_id=jid, started=True, finished=True)
 
     if mode == 'cleanup':
         os.unlink(log_path)
@@ -151,16 +153,16 @@ def main():
     except Exception:
         if not data:
             # file not written yet?  That means it is running
-            module.exit_json(results_file=log_path, ansible_job_id=jid, started=1, finished=0)
+            module.exit_json(results_file=log_path, ansible_job_id=jid, started=True, finished=False)
         else:
             module.fail_json(ansible_job_id=jid, results_file=log_path,
-                             msg="Could not parse job output: %s" % data, started=1, finished=1)
+                             msg="Could not parse job output: %s" % data, started=True, finished=True)
 
     if 'started' not in data:
-        data['finished'] = 1
+        data['finished'] = True
         data['ansible_job_id'] = jid
     elif 'finished' not in data:
-        data['finished'] = 0
+        data['finished'] = False
 
     # just write the module output directly to stdout and exit; bypass other processing done by exit_json since it's already been done
     print(f"\n{json.dumps(data)}")  # pylint: disable=ansible-bad-function

ansible/modules/async_wrapper.py

@@ -149,7 +149,7 @@ def _run_module(wrapped_cmd, jid):
 
     # DTFIX-FUTURE: needs rework for serialization profiles
 
-    jwrite({"started": 1, "finished": 0, "ansible_job_id": jid})
+    jwrite({"started": True, "finished": False, "ansible_job_id": jid})
 
     result = {}
 
@@ -203,7 +203,7 @@ def _run_module(wrapped_cmd, jid):
     except (OSError, IOError):
         e = sys.exc_info()[1]
         result = {
-            "failed": 1,
+            "failed": True,
             "cmd": wrapped_cmd,
             "msg": to_text(e),
             "outdata": outdata,  # temporary notice only
@@ -214,7 +214,7 @@ def _run_module(wrapped_cmd, jid):
 
     except (ValueError, Exception):
         result = {
-            "failed": 1,
+            "failed": True,
             "cmd": wrapped_cmd,
             "data": outdata,  # temporary notice only
             "stderr": stderr,
@@ -260,7 +260,7 @@ def main():
         _make_temp_dir(jobdir)
     except Exception as e:
         end({
-            "failed": 1,
+            "failed": True,
             "msg": "could not create directory: %s - %s" % (jobdir, to_text(e)),
             "exception": to_text(traceback.format_exc()),  # NB: task executor compat will coerce to the correct dataclass type
         }, 1)
@@ -293,7 +293,7 @@ def main():
                     continue
 
             notice("Return async_wrapper task started.")
-            end({"failed": 0, "started": 1, "finished": 0, "ansible_job_id": jid, "results_file": job_path,
+            end({"failed": False, "started": True, "finished": False, "ansible_job_id": jid, "results_file": job_path,
                  "_ansible_suppress_tmpdir_delete": (not preserve_tmp)}, 0)
         else:
             # The actual wrapper process

ansible/modules/cron.py

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

ansible/modules/dnf5.py

@@ -365,7 +365,7 @@ from ansible.module_utils.yumdnf import YumDnf, yumdnf_argument_spec
 
 libdnf5 = None
 # Through dnf5-5.2.12 all exceptions raised through swig became RuntimeError
-LIBDNF5_ERROR = RuntimeError
+LIBDNF5_ERRORS = RuntimeError
 
 
 def is_installed(base, spec):
@@ -423,7 +423,9 @@ def is_newer_version_installed(base, spec):
 
     try:
         spec_nevra = next(iter(libdnf5.rpm.Nevra.parse(spec)))
-    except (LIBDNF5_ERROR, StopIteration):
+    except LIBDNF5_ERRORS:
+        return False
+    except StopIteration:
         return False
 
     spec_version = spec_nevra.get_version()
@@ -517,7 +519,7 @@ class Dnf5Module(YumDnf):
         os.environ["LANGUAGE"] = os.environ["LANG"] = locale
 
         global libdnf5
-        global LIBDNF5_ERROR
+        global LIBDNF5_ERRORS
         has_dnf = True
         try:
             import libdnf5  # type: ignore[import]
@@ -526,7 +528,7 @@ class Dnf5Module(YumDnf):
 
         try:
             import libdnf5.exception  # type: ignore[import-not-found]
-            LIBDNF5_ERROR = libdnf5.exception.Error
+            LIBDNF5_ERRORS = (libdnf5.exception.Error, libdnf5.exception.NonLibdnf5Exception)
         except (ImportError, AttributeError):
             pass
 
@@ -581,15 +583,7 @@ class Dnf5Module(YumDnf):
         if self.conf_file:
             conf.config_file_path = self.conf_file
 
-        try:
-            base.load_config()
-        except LIBDNF5_ERROR as e:
-            self.module.fail_json(
-                msg=str(e),
-                conf_file=self.conf_file,
-                failures=[],
-                rc=1,
-            )
+        base.load_config()
 
         if self.releasever is not None:
             variables = base.get_vars()
@@ -722,6 +716,7 @@ class Dnf5Module(YumDnf):
             if self.security:
                 types.append("security")
             advisory_query.filter_type(types)
+            conf.skip_unavailable = True  # ignore packages that are of a different type, for backwards compat
             settings.set_advisory_filter(advisory_query)
 
         goal = libdnf5.base.Goal(base)
@@ -744,19 +739,13 @@ class Dnf5Module(YumDnf):
                         goal.add_install(spec, settings)
         elif self.state in {"absent", "removed"}:
             for spec in self.names:
-                try:
-                    goal.add_remove(spec, settings)
-                except LIBDNF5_ERROR as e:
-                    self.module.fail_json(msg=str(e), failures=[], rc=1)
+                goal.add_remove(spec, settings)
             if self.autoremove:
                 for pkg in get_unneeded_pkgs(base):
                     goal.add_rpm_remove(pkg, settings)
 
         goal.set_allow_erasing(self.allowerasing)
-        try:
-            transaction = goal.resolve()
-        except LIBDNF5_ERROR as e:
-            self.module.fail_json(msg=str(e), failures=[], rc=1)
+        transaction = goal.resolve()
 
         if transaction.get_problems():
             failures = []
@@ -832,7 +821,11 @@ def main():
             auto_install_module_deps=dict(type="bool", default=True),
         )
     )
-    Dnf5Module(AnsibleModule(**yumdnf_argument_spec)).run()
+    module = AnsibleModule(**yumdnf_argument_spec)
+    try:
+        Dnf5Module(module).run()
+    except LIBDNF5_ERRORS as e:
+        module.fail_json(msg=str(e), failures=[], rc=1)
 
 
 if __name__ == "__main__":

ansible/modules/git.py

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

ansible/modules/hostname.py

@@ -1,4 +1,3 @@
-#!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright: (c) 2013, Hiroaki Nakamura <hnakamur@gmail.com>

ansible/modules/pip.py

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

ansible/modules/service.py

@@ -180,7 +180,7 @@ from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.common.locale import get_best_parsable_locale
 from ansible.module_utils.common.sys_info import get_platform_subclass
 from ansible.module_utils.service import fail_if_missing, is_systemd_managed
-from ansible.module_utils.six import PY2, b
+from ansible.module_utils.six import b
 
 
 class Service(object):
@@ -285,14 +285,8 @@ class Service(object):
                 os._exit(0)
 
             # Start the command
-            if PY2:
-                # Python 2.6's shlex.split can't handle text strings correctly
-                cmd = to_bytes(cmd, errors='surrogate_or_strict')
-                cmd = shlex.split(cmd)
-            else:
-                # Python3.x shex.split text strings.
-                cmd = to_text(cmd, errors='surrogate_or_strict')
-                cmd = [to_bytes(c, errors='surrogate_or_strict') for c in shlex.split(cmd)]
+            cmd = to_text(cmd, errors='surrogate_or_strict')
+            cmd = [to_bytes(c, errors='surrogate_or_strict') for c in shlex.split(cmd)]
             # In either of the above cases, pass a list of byte strings to Popen
 
             # chkconfig localizes messages and we're screen scraping so make

ansible/modules/sysvinit.py

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

ansible/parsing/ajson.py

@@ -4,15 +4,13 @@
 from __future__ import annotations as _annotations
 
 # from ansible.utils.display import Display as _Display
-
-
-# DTFIX-RELEASE: The pylint deprecated checker does not detect `Display().deprecated` calls, of which we have many.
-
+#
+#
 # deprecated: description='deprecate ajson' core_version='2.23'
 # _Display().deprecated(
 #     msg='The `ansible.parsing.ajson` module is deprecated.',
 #     version='2.27',
-#     help_text="",  # DTFIX-RELEASE: complete this help text
+#     help_text="",  # DTFIX-FUTURE: complete this help text
 # )
 
 # Imported for backward compat

ansible/parsing/dataloader.py

@@ -15,7 +15,7 @@ import typing as t
 
 from ansible import constants as C
 from ansible.errors import AnsibleFileNotFound, AnsibleParserError
-from ansible._internal._errors import _utils
+from ansible._internal._errors import _error_utils
 from ansible.module_utils.basic import is_executable
 from ansible._internal._datatag._tags import Origin, TrustedAsTemplate, SourceWasEncrypted
 from ansible.module_utils._internal._datatag import AnsibleTagHelper
@@ -81,12 +81,12 @@ class DataLoader:
     def load(
             self,
             data: str,
-            file_name: str | None = None,  # DTFIX-RELEASE: consider deprecating this in favor of tagging Origin on data
-            show_content: bool = True,  # DTFIX-RELEASE: consider future deprecation, but would need RedactAnnotatedSourceContext public
+            file_name: str | None = None,  # DTFIX-FUTURE: consider deprecating this in favor of tagging Origin on data
+            show_content: bool = True,  # DTFIX-FUTURE: consider future deprecation, but would need RedactAnnotatedSourceContext public
             json_only: bool = False,
     ) -> t.Any:
         """Backwards compat for now"""
-        with _utils.RedactAnnotatedSourceContext.when(not show_content):
+        with _error_utils.RedactAnnotatedSourceContext.when(not show_content):
             return from_yaml(data=data, file_name=file_name, json_only=json_only)
 
     def load_from_file(self, file_name: str, cache: str = 'all', unsafe: bool = False, json_only: bool = False, trusted_as_template: bool = False) -> t.Any:

ansible/parsing/mod_args.py

@@ -160,7 +160,7 @@ class ModuleArgsParser:
         final_args = dict()
         if additional_args:
             if isinstance(additional_args, (str, EncryptedString)):
-                # DTFIX-RELEASE: should this be is_possibly_template?
+                # DTFIX5: should this be is_possibly_template?
                 if TemplateEngine().is_template(additional_args):
                     final_args['_variable_params'] = additional_args
                 else:

ansible/parsing/plugin_docs.py

@@ -41,7 +41,7 @@ def read_docstring_from_yaml_file(filename, verbose=True, ignore_errors=True):
             file_data = yaml.load(yamlfile, Loader=AnsibleLoader)
     except Exception as ex:
         msg = f"Unable to parse yaml file {filename}"
-        # DTFIX-RELEASE: find a better pattern for this (can we use the new optional error behavior?)
+        # DTFIX-FUTURE: find a better pattern for this (can we use the new optional error behavior?)
         if not ignore_errors:
             raise AnsibleParserError(f'{msg}.') from ex
         elif verbose:
@@ -93,7 +93,7 @@ def read_docstring_from_python_file(filename, verbose=True, ignore_errors=True):
 
     except Exception as ex:
         msg = f"Unable to parse documentation in python file {filename!r}"
-        # DTFIX-RELEASE: better pattern to conditionally raise/display
+        # DTFIX-FUTURE: better pattern to conditionally raise/display
         if not ignore_errors:
             raise AnsibleParserError(f'{msg}.') from ex
         elif verbose:

ansible/parsing/utils/yaml.py

@@ -11,7 +11,7 @@ import typing as t
 import yaml
 
 from ansible.errors import AnsibleJSONParserError
-from ansible._internal._errors import _utils
+from ansible._internal._errors import _error_utils
 from ansible.parsing.vault import VaultSecret
 from ansible.parsing.yaml.loader import AnsibleLoader
 from ansible._internal._yaml._errors import AnsibleYAMLParserError
@@ -34,7 +34,7 @@ def from_yaml(
 
     data = origin.tag(data)
 
-    with _utils.RedactAnnotatedSourceContext.when(not show_content):
+    with _error_utils.RedactAnnotatedSourceContext.when(not show_content):
         try:
             # we first try to load this data as JSON.
             # Fixes issues with extra vars json strings not being parsed correctly by the yaml parser
@@ -48,6 +48,6 @@ def from_yaml(
         try:
             return yaml.load(data, Loader=AnsibleLoader)  # type: ignore[arg-type]
         except Exception as yaml_ex:
-            # DTFIX-RELEASE: how can we indicate in Origin that the data is in-memory only, to support context information -- is that useful?
+            # DTFIX-FUTURE: how can we indicate in Origin that the data is in-memory only, to support context information -- is that useful?
             #        we'd need to pass data to handle_exception so it could be used as the content instead of reading from disk
             AnsibleYAMLParserError.handle_exception(yaml_ex, origin=origin)

ansible/parsing/vault/__init__.py

@@ -149,7 +149,7 @@ def _parse_vaulttext_envelope(b_vaulttext_envelope, default_vault_id=None):
         vault_id = to_text(b_tmpheader[3].strip())
 
     b_ciphertext = b''.join(b_tmpdata[1:])
-    # DTFIX-RELEASE: possible candidate for propagate_origin
+    # DTFIX7: possible candidate for propagate_origin
     b_ciphertext = AnsibleTagHelper.tag_copy(b_vaulttext_envelope, b_ciphertext)
 
     return b_ciphertext, b_version, cipher_name, vault_id
@@ -222,7 +222,7 @@ def format_vaulttext_envelope(b_ciphertext, cipher_name, version=None, vault_id=
 
 def _unhexlify(b_data):
     try:
-        # DTFIX-RELEASE: possible candidate for propagate_origin
+        # DTFIX7: possible candidate for propagate_origin
         return AnsibleTagHelper.tag_copy(b_data, unhexlify(b_data))
     except (BinasciiError, TypeError) as ex:
         raise AnsibleVaultFormatError('Vault format unhexlify error.', obj=b_data) from ex
@@ -712,7 +712,7 @@ class VaultLib:
                 # secret = self.secrets[vault_secret_id]
                 display.vvvv(u'Trying secret %s for vault_id=%s' % (to_text(vault_secret), to_text(vault_secret_id)))
                 b_plaintext = this_cipher.decrypt(b_vaulttext, vault_secret)
-                # DTFIX-RELEASE: possible candidate for propagate_origin
+                # DTFIX7: possible candidate for propagate_origin
                 b_plaintext = AnsibleTagHelper.tag_copy(vaulttext, b_plaintext)
                 if b_plaintext is not None:
                     vault_id_used = vault_secret_id
@@ -1520,7 +1520,7 @@ class VaultHelper:
             tags = AnsibleTagHelper.tags(ciphertext)  # ciphertext has tags but value does not
         elif value_type is EncryptedString:
             ciphertext = value._ciphertext
-        elif value_type in _jinja_common.Marker.concrete_subclasses:  # avoid wasteful raise/except of Marker when calling get_tag below
+        elif value_type in _jinja_common.Marker._concrete_subclasses:  # avoid wasteful raise/except of Marker when calling get_tag below
             ciphertext = None
         elif vaulted_value := VaultedValue.get_tag(value):
             ciphertext = vaulted_value.ciphertext

ansible/playbook/playbook_include.py

@@ -164,5 +164,5 @@ class PlaybookInclude(Base, Conditional, Taggable):
         if len(items) == 0:
             raise AnsibleParserError("import_playbook statements must specify the file name to import", obj=ds)
 
-        # DTFIX-RELEASE: investigate this as a possible "problematic strip"
+        # DTFIX3: investigate this as a possible "problematic strip"
         new_ds['import_playbook'] = AnsibleTagHelper.tag_copy(v, items[0].strip())