ansible-core 2.15.4rc1__py3-none-any.whl → 2.16.0b2__py3-none-any.whl

ansible/plugins/test/is_mount.yml

@@ -18,5 +18,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the path corresponds to a mount point on the controller, C(False) if otherwise.
+    description: Returns V(True) if the path corresponds to a mount point on the controller, V(False) if otherwise.
     type: boolean

ansible/plugins/test/is_same_file.yml

@@ -20,5 +20,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the paths correspond to the same location on the filesystem on the controller, C(False) if otherwise.
+    description: Returns V(True) if the paths correspond to the same location on the filesystem on the controller, V(False) if otherwise.
     type: boolean

ansible/plugins/test/isnan.yml

@@ -16,5 +16,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the input is NaN, C(False) if otherwise.
+    description: Returns V(True) if the input is NaN, V(False) if otherwise.
     type: boolean

ansible/plugins/test/issubset.yml

@@ -6,7 +6,6 @@ DOCUMENTATION:
   short_description: is the list a subset of this other list
   description:
     - Validate if the first list is a sub set (is included) of the second list.
-    - Same as the C(all) Python function.
   options:
     _input:
       description: List.
@@ -24,5 +23,5 @@ EXAMPLES: |
   issmallinbig: '{{ small is subset(big) }}'
 RETURN:
   _value:
-    description: Returns C(True) if the specified list is a subset of the provided list, C(False) otherwise.
+    description: Returns V(True) if the specified list is a subset of the provided list, V(False) otherwise.
     type: boolean

ansible/plugins/test/issuperset.yml

@@ -6,7 +6,6 @@ DOCUMENTATION:
   aliases: [issuperset]
   description:
     - Validate if the first list is a super set (includes) the second list.
-    - Same as the C(all) Python function.
   options:
     _input:
       description: List.
@@ -24,5 +23,5 @@ EXAMPLES: |
   issmallinbig: '{{ big is superset(small) }}'
 RETURN:
   _value:
-    description: Returns C(True) if the specified list is a superset of the provided list, C(False) otherwise.
+    description: Returns V(True) if the specified list is a superset of the provided list, V(False) otherwise.
     type: boolean

ansible/plugins/test/link.yml

@@ -17,5 +17,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the path corresponds to an existing symlink on the filesystem on the controller, C(False) if otherwise.
+    description: Returns V(True) if the path corresponds to an existing symlink on the filesystem on the controller, V(False) if otherwise.
     type: boolean

ansible/plugins/test/link_exists.yml

@@ -17,5 +17,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the path corresponds to an existing filesystem object on the controller, C(False) if otherwise.
+    description: Returns V(True) if the path corresponds to an existing filesystem object on the controller, V(False) if otherwise.
     type: boolean

ansible/plugins/test/match.yml

@@ -19,7 +19,7 @@ DOCUMENTATION:
       type: boolean
       default: False
     multiline:
-      description: Match against mulitple lines in string.
+      description: Match against multiple lines in string.
       type: boolean
       default: False
 EXAMPLES: |
@@ -28,5 +28,5 @@ EXAMPLES: |
   nomatch: url is match("/users/.*/resources")
 RETURN:
   _value:
-    description: Returns C(True) if there is a match, C(False) otherwise.
+    description: Returns V(True) if there is a match, V(False) otherwise.
     type: boolean

ansible/plugins/test/mount.yml

@@ -18,5 +18,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the path corresponds to a mount point on the controller, C(False) if otherwise.
+    description: Returns V(True) if the path corresponds to a mount point on the controller, V(False) if otherwise.
     type: boolean

ansible/plugins/test/nan.yml

@@ -16,5 +16,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the input is NaN, C(False) if otherwise.
+    description: Returns V(True) if the input is NaN, V(False) if otherwise.
     type: boolean

ansible/plugins/test/reachable.yml

@@ -5,7 +5,7 @@ DOCUMENTATION:
   short_description: Task did not end due to unreachable host
   description:
     - Tests if task was able to reach the host for execution
-    - This test checks for the existance of a C(unreachable) key in the input dictionary and that it is C(False) if present
+    - This test checks for the existance of a C(unreachable) key in the input dictionary and that it is V(False) if present
   options:
     _input:
       description: registered result from an Ansible task
@@ -17,5 +17,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the task did not flag the host as unreachable, C(False) otherwise.
+    description: Returns V(True) if the task did not flag the host as unreachable, V(False) otherwise.
     type: boolean

ansible/plugins/test/regex.yml

@@ -33,5 +33,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if there is a match, C(False) otherwise.
+    description: Returns V(True) if there is a match, V(False) otherwise.
     type: boolean

ansible/plugins/test/same_file.yml

@@ -20,5 +20,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the paths correspond to the same location on the filesystem on the controller, C(False) if otherwise.
+    description: Returns V(True) if the paths correspond to the same location on the filesystem on the controller, V(False) if otherwise.
     type: boolean

ansible/plugins/test/search.yml

@@ -18,7 +18,7 @@ DOCUMENTATION:
       type: boolean
       default: False
     multiline:
-      description: Match against mulitple lines in string.
+      description: Match against multiple lines in string.
       type: boolean
       default: False
 
@@ -29,5 +29,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if there is a match, C(False) otherwise.
+    description: Returns V(True) if there is a match, V(False) otherwise.
     type: boolean

ansible/plugins/test/skip.yml

@@ -6,7 +6,7 @@ DOCUMENTATION:
   aliases: [skip]
   description:
     - Tests if task was skipped
-    - This test checks for the existance of a C(skipped) key in the input dictionary and that it is C(True) if present
+    - This test checks for the existance of a C(skipped) key in the input dictionary and that it is V(True) if present
   options:
     _input:
       description: registered result from an Ansible task
@@ -14,9 +14,9 @@ DOCUMENTATION:
       required: True
 EXAMPLES: |
   # test 'status' to know how to respond
-  {{ (taskresults is skipped}}
+  {{ taskresults is skipped }}
 
 RETURN:
   _value:
-    description: Returns C(True) if the task was skipped, C(False) otherwise.
+    description: Returns V(True) if the task was skipped, V(False) otherwise.
     type: boolean

ansible/plugins/test/skipped.yml

@@ -6,7 +6,7 @@ DOCUMENTATION:
   aliases: [skip]
   description:
     - Tests if task was skipped
-    - This test checks for the existance of a C(skipped) key in the input dictionary and that it is C(True) if present
+    - This test checks for the existance of a C(skipped) key in the input dictionary and that it is V(True) if present
   options:
     _input:
       description: registered result from an Ansible task
@@ -14,9 +14,9 @@ DOCUMENTATION:
       required: True
 EXAMPLES: |
   # test 'status' to know how to respond
-  {{ (taskresults is skipped}}
+  {{ taskresults is skipped }}
 
 RETURN:
   _value:
-    description: Returns C(True) if the task was skipped, C(False) otherwise.
+    description: Returns V(True) if the task was skipped, V(False) otherwise.
     type: boolean

ansible/plugins/test/started.yml

@@ -5,7 +5,7 @@ DOCUMENTATION:
   short_description: Was async task started
   description:
     - Used to check if an async task has started, will also work with non async tasks but will issue a warning.
-    - This test checks for the existance of a C(started) key in the input dictionary and that it is C(1) if present
+    - This test checks for the existance of a C(started) key in the input dictionary and that it is V(1) if present
   options:
     _input:
       description: registered result from an Ansible task
@@ -17,5 +17,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the task has started, C(False) otherwise.
+    description: Returns V(True) if the task has started, V(False) otherwise.
     type: boolean

ansible/plugins/test/subset.yml

@@ -6,7 +6,6 @@ DOCUMENTATION:
   short_description: is the list a subset of this other list
   description:
     - Validate if the first list is a sub set (is included) of the second list.
-    - Same as the C(all) Python function.
   options:
     _input:
       description: List.
@@ -24,5 +23,5 @@ EXAMPLES: |
   issmallinbig: '{{ small is subset(big) }}'
 RETURN:
   _value:
-    description: Returns C(True) if the specified list is a subset of the provided list, C(False) otherwise.
+    description: Returns V(True) if the specified list is a subset of the provided list, V(False) otherwise.
     type: boolean

ansible/plugins/test/succeeded.yml

@@ -6,7 +6,7 @@ DOCUMENTATION:
   aliases: [succeeded, successful]
   description:
     - Tests if task finished successfully, opposite of C(failed).
-    - This test checks for the existance of a C(failed) key in the input dictionary and that it is C(False) if present
+    - This test checks for the existance of a C(failed) key in the input dictionary and that it is V(False) if present
   options:
     _input:
       description: registered result from an Ansible task
@@ -18,5 +18,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the task was successfully completed, C(False) otherwise.
+    description: Returns V(True) if the task was successfully completed, V(False) otherwise.
     type: boolean

ansible/plugins/test/success.yml

@@ -6,7 +6,7 @@ DOCUMENTATION:
   aliases: [succeeded, successful]
   description:
     - Tests if task finished successfully, opposite of C(failed).
-    - This test checks for the existance of a C(failed) key in the input dictionary and that it is C(False) if present
+    - This test checks for the existance of a C(failed) key in the input dictionary and that it is V(False) if present
   options:
     _input:
       description: registered result from an Ansible task
@@ -18,5 +18,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the task was successfully completed, C(False) otherwise.
+    description: Returns V(True) if the task was successfully completed, V(False) otherwise.
     type: boolean

ansible/plugins/test/successful.yml

@@ -6,7 +6,7 @@ DOCUMENTATION:
   aliases: [succeeded, successful]
   description:
     - Tests if task finished successfully, opposite of C(failed).
-    - This test checks for the existance of a C(failed) key in the input dictionary and that it is C(False) if present
+    - This test checks for the existance of a C(failed) key in the input dictionary and that it is V(False) if present
   options:
     _input:
       description: registered result from an Ansible task
@@ -18,5 +18,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the task was successfully completed, C(False) otherwise.
+    description: Returns V(True) if the task was successfully completed, V(False) otherwise.
     type: boolean

ansible/plugins/test/superset.yml

@@ -6,7 +6,6 @@ DOCUMENTATION:
   aliases: [issuperset]
   description:
     - Validate if the first list is a super set (includes) the second list.
-    - Same as the C(all) Python function.
   options:
     _input:
       description: List.
@@ -24,5 +23,5 @@ EXAMPLES: |
   issmallinbig: '{{ big is superset(small) }}'
 RETURN:
   _value:
-    description: Returns C(True) if the specified list is a superset of the provided list, C(False) otherwise.
+    description: Returns V(True) if the specified list is a superset of the provided list, V(False) otherwise.
     type: boolean

ansible/plugins/test/truthy.yml

@@ -5,14 +5,14 @@ DOCUMENTATION:
   short_description: Pythonic true
   description:
     - This check is a more Python version of what is 'true'.
-    - It is the opposite of C(falsy).
+    - It is the opposite of P(ansible.builtin.falsy#test).
   options:
     _input:
       description: An expression that can be expressed in a boolean context.
       type: string
       required: True
     convert_bool:
-      description: Attempts to convert to strict python boolean vs normally acceptable values (C(yes)/C(no), C(on)/C(off), C(0)/C(1), etc).
+      description: Attempts to convert to strict python boolean vs normally acceptable values (V(yes)/V(no), V(on)/V(off), V(0)/V(1), etc).
       type: bool
       default: false
 EXAMPLES: |
@@ -20,5 +20,5 @@ EXAMPLES: |
     thisisfalse: '{{ "" is truthy }}'
 RETURN:
   _value:
-    description: Returns C(True) if the condition is not "Python truthy", C(False) otherwise.
+    description: Returns V(True) if the condition is not "Python truthy", V(False) otherwise.
     type: boolean

ansible/plugins/test/unreachable.yml

@@ -5,7 +5,7 @@ DOCUMENTATION:
   short_description: Did task end due to the host was unreachable
   description:
     - Tests if task was not able to reach the host for execution
-    - This test checks for the existance of a C(unreachable) key in the input dictionary and that it's value is C(True)
+    - This test checks for the existance of a C(unreachable) key in the input dictionary and that it's value is V(True)
   options:
     _input:
       description: registered result from an Ansible task
@@ -17,5 +17,5 @@ EXAMPLES: |
 
 RETURN:
   _value:
-    description: Returns C(True) if the task flagged the host as unreachable, C(False) otherwise.
+    description: Returns V(True) if the task flagged the host as unreachable, V(False) otherwise.
     type: boolean

ansible/plugins/test/uri.yml

@@ -26,5 +26,5 @@ EXAMPLES: |
   {{ 'http://nobody:secret@example.com' is uri(['ftp', 'ftps', 'http', 'https', 'ws', 'wss']) }}
 RETURN:
   _value:
-    description: Returns C(false) if the string is not a URI or the schema extracted does not match the supplied list.
+    description: Returns V(false) if the string is not a URI or the schema extracted does not match the supplied list.
     type: boolean

ansible/plugins/test/url.yml

@@ -25,5 +25,5 @@ EXAMPLES: |
   {{ 'ftp://admin:secret@example.com/path/to/myfile.yml' is url }}
 RETURN:
   _value:
-    description: Returns C(false) if the string is not a URL, C(true) otherwise.
+    description: Returns V(false) if the string is not a URL, V(true) otherwise.
     type: boolean

ansible/plugins/test/urn.yml

@@ -17,5 +17,5 @@ EXAMPLES: |
   {{ 'mailto://nowone@example.com' is not urn }}
 RETURN:
   _value:
-    description: Returns C(true) if the string is a URN and C(false) if  it is not.
+    description: Returns V(true) if the string is a URN and V(false) if  it is not.
     type: boolean

ansible/plugins/test/vault_encrypted.yml

@@ -15,5 +15,5 @@ EXAMPLES: |
     thisistrue: '{{ "$ANSIBLE_VAULT;1.2;AES256;dev...." is ansible_vault }}'
 RETURN:
   _value:
-    description: Returns C(True) if the input is a valid ansible vault, C(False) otherwise.
+    description: Returns V(True) if the input is a valid ansible vault, V(False) otherwise.
     type: boolean

ansible/plugins/test/version.yml

@@ -36,12 +36,12 @@ DOCUMENTATION:
         - ne
       default: eq
     strict:
-      description: Whether to use strict version scheme. Mutually exclusive with C(version_type)
+      description: Whether to use strict version scheme. Mutually exclusive with O(version_type)
       type: boolean
       required: False
       default: False
     version_type:
-      description: Version scheme to use for comparison. Mutually exclusive with C(strict). See C(notes) for descriptions on the version types.
+      description: Version scheme to use for comparison. Mutually exclusive with O(strict). See C(notes) for descriptions on the version types.
       type: string
       required: False
       choices:
@@ -52,10 +52,10 @@ DOCUMENTATION:
         - pep440
       default: loose
   notes:
-    - C(loose) - This type corresponds to the Python C(distutils.version.LooseVersion) class. All version formats are valid for this type. The rules for comparison are simple and predictable, but may not always give expected results.
-    - C(strict) - This type corresponds to the Python C(distutils.version.StrictVersion) class. A version number consists of two or three dot-separated numeric components, with an optional "pre-release" tag on the end. The pre-release tag consists of a single letter C(a) or C(b) followed by a number.  If the numeric components of two version numbers are equal, then one with a pre-release tag will always be deemed earlier (lesser) than one without.
-    - C(semver)/C(semantic) - This type implements the L(Semantic Version,https://semver.org) scheme for version comparison.
-    - C(pep440) - This type implements the Python L(PEP-440,https://peps.python.org/pep-0440/) versioning rules for version comparison. Added in version 2.14.
+    - V(loose) - This type corresponds to the Python C(distutils.version.LooseVersion) class. All version formats are valid for this type. The rules for comparison are simple and predictable, but may not always give expected results.
+    - V(strict) - This type corresponds to the Python C(distutils.version.StrictVersion) class. A version number consists of two or three dot-separated numeric components, with an optional "pre-release" tag on the end. The pre-release tag consists of a single letter C(a) or C(b) followed by a number.  If the numeric components of two version numbers are equal, then one with a pre-release tag will always be deemed earlier (lesser) than one without.
+    - V(semver)/V(semantic) - This type implements the L(Semantic Version,https://semver.org) scheme for version comparison.
+    - V(pep440) - This type implements the Python L(PEP-440,https://peps.python.org/pep-0440/) versioning rules for version comparison. Added in version 2.14.
 EXAMPLES: |
   - name: version test examples
     assert:
@@ -78,5 +78,5 @@ EXAMPLES: |
         - "'2.14.0rc1' is version('2.14.0', 'lt', version_type='pep440')"
 RETURN:
   _value:
-    description: Returns C(True) or C(False) depending on the outcome of the comparison.
+    description: Returns V(True) or V(False) depending on the outcome of the comparison.
     type: boolean

ansible/plugins/test/version_compare.yml

@@ -36,12 +36,12 @@ DOCUMENTATION:
         - ne
       default: eq
     strict:
-      description: Whether to use strict version scheme. Mutually exclusive with C(version_type)
+      description: Whether to use strict version scheme. Mutually exclusive with O(version_type)
       type: boolean
       required: False
       default: False
     version_type:
-      description: Version scheme to use for comparison. Mutually exclusive with C(strict). See C(notes) for descriptions on the version types.
+      description: Version scheme to use for comparison. Mutually exclusive with O(strict). See C(notes) for descriptions on the version types.
       type: string
       required: False
       choices:
@@ -52,10 +52,10 @@ DOCUMENTATION:
         - pep440
       default: loose
   notes:
-    - C(loose) - This type corresponds to the Python C(distutils.version.LooseVersion) class. All version formats are valid for this type. The rules for comparison are simple and predictable, but may not always give expected results.
-    - C(strict) - This type corresponds to the Python C(distutils.version.StrictVersion) class. A version number consists of two or three dot-separated numeric components, with an optional "pre-release" tag on the end. The pre-release tag consists of a single letter C(a) or C(b) followed by a number.  If the numeric components of two version numbers are equal, then one with a pre-release tag will always be deemed earlier (lesser) than one without.
-    - C(semver)/C(semantic) - This type implements the L(Semantic Version,https://semver.org) scheme for version comparison.
-    - C(pep440) - This type implements the Python L(PEP-440,https://peps.python.org/pep-0440/) versioning rules for version comparison. Added in version 2.14.
+    - V(loose) - This type corresponds to the Python C(distutils.version.LooseVersion) class. All version formats are valid for this type. The rules for comparison are simple and predictable, but may not always give expected results.
+    - V(strict) - This type corresponds to the Python C(distutils.version.StrictVersion) class. A version number consists of two or three dot-separated numeric components, with an optional "pre-release" tag on the end. The pre-release tag consists of a single letter C(a) or C(b) followed by a number.  If the numeric components of two version numbers are equal, then one with a pre-release tag will always be deemed earlier (lesser) than one without.
+    - V(semver)/V(semantic) - This type implements the L(Semantic Version,https://semver.org) scheme for version comparison.
+    - V(pep440) - This type implements the Python L(PEP-440,https://peps.python.org/pep-0440/) versioning rules for version comparison. Added in version 2.14.
 EXAMPLES: |
   - name: version test examples
     assert:
@@ -78,5 +78,5 @@ EXAMPLES: |
         - "'2.14.0rc1' is version('2.14.0', 'lt', version_type='pep440')"
 RETURN:
   _value:
-    description: Returns C(True) or C(False) depending on the outcome of the comparison.
+    description: Returns V(True) or V(False) depending on the outcome of the comparison.
     type: boolean

ansible/plugins/vars/host_group_vars.py

@@ -55,7 +55,7 @@ DOCUMENTATION = '''
 
 import os
 from ansible.errors import AnsibleParserError
-from ansible.module_utils._text import to_bytes, to_native, to_text
+from ansible.module_utils.common.text.converters import to_bytes, to_native, to_text
 from ansible.plugins.vars import BaseVarsPlugin
 from ansible.inventory.host import Host
 from ansible.inventory.group import Group

ansible/release.py

@@ -19,6 +19,6 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-__version__ = '2.15.4rc1'
+__version__ = '2.16.0b2'
 __author__ = 'Ansible, Inc.'
-__codename__ = "Ten Years Gone"
+__codename__ = "All My Love"

ansible/template/__init__.py

@@ -45,8 +45,8 @@ from ansible.errors import (
     AnsibleOptionsError,
     AnsibleUndefinedVariable,
 )
-from ansible.module_utils.six import string_types, text_type
-from ansible.module_utils._text import to_native, to_text, to_bytes
+from ansible.module_utils.six import string_types
+from ansible.module_utils.common.text.converters import to_native, to_text, to_bytes
 from ansible.module_utils.common.collections import is_sequence
 from ansible.plugins.loader import filter_loader, lookup_loader, test_loader
 from ansible.template.native_helpers import ansible_native_concat, ansible_eval_concat, ansible_concat
@@ -55,7 +55,7 @@ from ansible.template.vars import AnsibleJ2Vars
 from ansible.utils.display import Display
 from ansible.utils.listify import listify_lookup_plugin_terms
 from ansible.utils.native_jinja import NativeJinjaText
-from ansible.utils.unsafe_proxy import wrap_var
+from ansible.utils.unsafe_proxy import to_unsafe_text, wrap_var
 
 display = Display()
 
@@ -103,9 +103,9 @@ def generate_ansible_template_vars(path, fullpath=None, dest_path=None):
     managed_str = managed_default.format(
         host=temp_vars['template_host'],
         uid=temp_vars['template_uid'],
-        file=temp_vars['template_path'],
+        file=temp_vars['template_path'].replace('%', '%%'),
     )
-    temp_vars['ansible_managed'] = to_text(time.strftime(to_native(managed_str), time.localtime(os.path.getmtime(b_path))))
+    temp_vars['ansible_managed'] = to_unsafe_text(time.strftime(to_native(managed_str), time.localtime(os.path.getmtime(b_path))))
 
     return temp_vars
 
@@ -130,7 +130,7 @@ def _escape_backslashes(data, jinja_env):
     backslashes inside of a jinja2 expression.
 
     """
-    if '\\' in data and '{{' in data:
+    if '\\' in data and jinja_env.variable_start_string in data:
         new_data = []
         d2 = jinja_env.preprocess(data)
         in_var = False
@@ -445,11 +445,11 @@ class JinjaPluginIntercept(MutableMapping):
 
         self._pluginloader = pluginloader
 
-        # cache of resolved plugins
+        # Jinja environment's mapping of known names (initially just J2 builtins)
         self._delegatee = delegatee
 
-        # track loaded plugins here as cache above includes 'jinja2' filters but ours should override
-        self._loaded_builtins = set()
+        # our names take precedence over Jinja's, but let things we've tried to resolve skip the pluginloader
+        self._seen_it = set()
 
     def __getitem__(self, key):
 
@@ -457,7 +457,10 @@ class JinjaPluginIntercept(MutableMapping):
             raise ValueError('key must be a string, got %s instead' % type(key))
 
         original_exc = None
-        if key not in self._loaded_builtins:
+        if key not in self._seen_it:
+            # this looks too early to set this- it isn't. Setting it here keeps requests for Jinja builtins from
+            # going through the pluginloader more than once, which is extremely slow for something that won't ever succeed.
+            self._seen_it.add(key)
             plugin = None
             try:
                 plugin = self._pluginloader.get(key)
@@ -471,12 +474,12 @@ class JinjaPluginIntercept(MutableMapping):
             if plugin:
                 # set in filter cache and avoid expensive plugin load
                 self._delegatee[key] = plugin.j2_function
-                self._loaded_builtins.add(key)
 
         # raise template syntax error if we could not find ours or jinja2 one
         try:
             func = self._delegatee[key]
         except KeyError as e:
+            self._seen_it.remove(key)
             raise TemplateSyntaxError('Could not load "%s": %s' % (key, to_native(original_exc or e)), 0)
 
         # if i do have func and it is a filter, it nees wrapping
@@ -578,14 +581,7 @@ class Templar:
     The main class for templating, with the main entry-point of template().
     '''
 
-    def __init__(self, loader, shared_loader_obj=None, variables=None):
-        if shared_loader_obj is not None:
-            display.deprecated(
-                "The `shared_loader_obj` option to `Templar` is no longer functional, "
-                "ansible.plugins.loader is used directly instead.",
-                version='2.16',
-            )
-
+    def __init__(self, loader, variables=None):
         self._loader = loader
         self._available_variables = {} if variables is None else variables
 
@@ -599,9 +595,6 @@ class Templar:
         )
         self.environment.template_class.environment_class = environment_class
 
-        # jinja2 global is inconsistent across versions, this normalizes them
-        self.environment.globals['dict'] = dict
-
         # Custom globals
         self.environment.globals['lookup'] = self._lookup
         self.environment.globals['query'] = self.environment.globals['q'] = self._query_lookup
@@ -611,11 +604,14 @@ class Templar:
         # the current rendering context under which the templar class is working
         self.cur_context = None
 
-        # FIXME this regex should be re-compiled each time variable_start_string and variable_end_string are changed
-        self.SINGLE_VAR = re.compile(r"^%s\s*(\w*)\s*%s$" % (self.environment.variable_start_string, self.environment.variable_end_string))
+        # this regex is re-compiled each time variable_start_string and variable_end_string are possibly changed
+        self._compile_single_var(self.environment)
 
         self.jinja2_native = C.DEFAULT_JINJA2_NATIVE
 
+    def _compile_single_var(self, env):
+        self.SINGLE_VAR = re.compile(r"^%s\s*(\w*)\s*%s$" % (env.variable_start_string, env.variable_end_string))
+
     def copy_with_new_env(self, environment_class=AnsibleEnvironment, **kwargs):
         r"""Creates a new copy of Templar with a new environment.
 
@@ -763,6 +759,7 @@ class Templar:
                 disable_lookups=disable_lookups,
                 convert_data=convert_data,
             )
+            self._compile_single_var(self.environment)
 
             return result
 
@@ -835,7 +832,7 @@ class Templar:
     def _now_datetime(self, utc=False, fmt=None):
         '''jinja2 global function to return current datetime, potentially formatted via strftime'''
         if utc:
-            now = datetime.datetime.utcnow()
+            now = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
         else:
             now = datetime.datetime.now()
 
@@ -955,8 +952,9 @@ class Templar:
         try:
             # NOTE Creating an overlay that lives only inside do_template means that overrides are not applied
             # when templating nested variables in AnsibleJ2Vars where Templar.environment is used, not the overlay.
-            # This is historic behavior that is kept for backwards compatibility.
             data, myenv = _create_overlay(data, overrides, self.environment)
+            # in case delimiters change
+            self._compile_single_var(myenv)
 
             if escape_backslashes:
                 # Allow users to specify backslashes in playbooks as "\\" instead of as "\\\\".

ansible/template/native_helpers.py

@@ -10,7 +10,7 @@ import ast
 from itertools import islice, chain
 from types import GeneratorType
 
-from ansible.module_utils._text import to_text
+from ansible.module_utils.common.text.converters import to_text
 from ansible.module_utils.six import string_types
 from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode
 from ansible.utils.native_jinja import NativeJinjaText

ansible/template/vars.py

@@ -6,7 +6,7 @@ from collections import ChainMap
 from jinja2.utils import missing
 
 from ansible.errors import AnsibleError, AnsibleUndefinedVariable
-from ansible.module_utils._text import to_native
+from ansible.module_utils.common.text.converters import to_native
 
 
 __all__ = ['AnsibleJ2Vars']