Normalize how None is handled in quote filter. Fixes #32174 (#71473)

ansible · Aug 27, 2020 · a1a624b · a1a624b
1 parent addee06
commit a1a624b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/changelogs/fragments/32174-normalize-None-quote.yml b/changelogs/fragments/32174-normalize-None-quote.yml
@@ -0,0 +1,3 @@
+bugfixes:
+- quote filter - normalize how ``None`` is handled, to match Python3 behavior
+  (https://github.com/ansible/ansible/issues/32174)
diff --git a/lib/ansible/plugins/filter/core.py b/lib/ansible/plugins/filter/core.py
@@ -110,6 +110,8 @@ def strftime(string_format, second=None):
 
 def quote(a):
     ''' return its argument quoted for shell usage '''
+    if a is None:
+        a = u''
     return shlex_quote(to_text(a))
 
 

diff --git a/test/integration/targets/filter_core/tasks/main.yml b/test/integration/targets/filter_core/tasks/main.yml
@@ -601,3 +601,10 @@
       bar: 123
     thing_items: '{{ thing_dict.items() }}'
     thing_range: '{{ range(10) }}'
+
+- name: Assert that quote works on None
+  assert:
+    that:
+      - thing|quote == "''"
+  vars:
+    thing: null