summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2017-01-11 10:45:46 -0600
committerJames Cammarata <jimi@sngx.net>2017-01-11 15:53:39 -0600
commit6dee2b21e625ce502cc46710b2de898e7cc67884 (patch)
tree56444cc070b96c832a707dd85baa821637e902c9
parentcc4634a5e73c06c6b4581f11171289ca9228391e (diff)
downloadansible-6dee2b21e625ce502cc46710b2de898e7cc67884.tar.gz
Partial revert of 76f7ce55
(cherry picked from commit a94a48f85fe4a76ab6e61ef9d1b9266b17cabc74)
-rw-r--r--lib/ansible/template/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/template/__init__.py b/lib/ansible/template/__init__.py
index 1a43486f9e..7fde0727de 100644
--- a/lib/ansible/template/__init__.py
+++ b/lib/ansible/template/__init__.py
@@ -383,7 +383,7 @@ class Templar:
disable_lookups=disable_lookups,
)
unsafe = hasattr(result, '__UNSAFE__')
- if convert_data and not self._no_type_regex.match(variable) and not unsafe:
+ if convert_data and not self._no_type_regex.match(variable):
# if this looks like a dictionary or list, convert it to such using the safe_eval method
if (result.startswith("{") and not result.startswith(self.environment.variable_start_string)) or \
result.startswith("[") or result in ("True", "False"):