summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Krizek <martin.krizek@gmail.com>2022-03-18 23:49:15 +0100
committerGitHub <noreply@github.com>2022-03-18 15:49:15 -0700
commit7ddf9c6bff95a5c688cfb79a35b6e246453528ab (patch)
treed345e3b54c084788598b9123e900dcfb09ec182f
parent26fd20c28753eb27193def3acfbc46c589e012a4 (diff)
downloadansible-7ddf9c6bff95a5c688cfb79a35b6e246453528ab.tar.gz
2.12: Add YAML representers for NativeJinjaUnsafeText and NativeJinjaText (#77299)
* Add a YAML representer for NativeJinjaUnsafeText (#76186) (cherry picked from commit dd220ddc2faf9510bdfedacf8b755798038591d9) * Add a YAML representer for NativeJinjaText (#77282) Fixes #77280 (cherry picked from commit c9db73f04e7a5fae7bbbdff8efbd585d15971d31)
-rw-r--r--changelogs/fragments/nativejinjatext-yaml-representer.yml2
-rw-r--r--changelogs/fragments/nativejinjaunsafetext-yaml-representer.yml2
-rw-r--r--lib/ansible/parsing/yaml/dumper.py12
3 files changed, 15 insertions, 1 deletions
diff --git a/changelogs/fragments/nativejinjatext-yaml-representer.yml b/changelogs/fragments/nativejinjatext-yaml-representer.yml
new file mode 100644
index 0000000000..ef2f460a09
--- /dev/null
+++ b/changelogs/fragments/nativejinjatext-yaml-representer.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - Add a YAML representer for ``NativeJinjaText``
diff --git a/changelogs/fragments/nativejinjaunsafetext-yaml-representer.yml b/changelogs/fragments/nativejinjaunsafetext-yaml-representer.yml
new file mode 100644
index 0000000000..e13486fb30
--- /dev/null
+++ b/changelogs/fragments/nativejinjaunsafetext-yaml-representer.yml
@@ -0,0 +1,2 @@
+bugfixes:
+ - Add a YAML representer for ``NativeJinjaUnsafeText``
diff --git a/lib/ansible/parsing/yaml/dumper.py b/lib/ansible/parsing/yaml/dumper.py
index 65d35781f7..8701bb8196 100644
--- a/lib/ansible/parsing/yaml/dumper.py
+++ b/lib/ansible/parsing/yaml/dumper.py
@@ -24,7 +24,7 @@ import yaml
from ansible.module_utils.six import text_type, binary_type
from ansible.module_utils.common.yaml import SafeDumper
from ansible.parsing.yaml.objects import AnsibleUnicode, AnsibleSequence, AnsibleMapping, AnsibleVaultEncryptedUnicode
-from ansible.utils.unsafe_proxy import AnsibleUnsafeText, AnsibleUnsafeBytes
+from ansible.utils.unsafe_proxy import AnsibleUnsafeText, AnsibleUnsafeBytes, NativeJinjaUnsafeText, NativeJinjaText
from ansible.template import AnsibleUndefined
from ansible.vars.hostvars import HostVars, HostVarsVars
from ansible.vars.manager import VarsWithSources
@@ -110,3 +110,13 @@ AnsibleDumper.add_representer(
AnsibleUndefined,
represent_undefined,
)
+
+AnsibleDumper.add_representer(
+ NativeJinjaUnsafeText,
+ represent_unicode,
+)
+
+AnsibleDumper.add_representer(
+ NativeJinjaText,
+ represent_unicode,
+)