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:57:41 -0600
commit7ec84394f98accc66c702416dc4dc70347d5f8a4 (patch)
tree56933c19ef9612f096085f10c1f3267b3aa7445e
parent35480106e50489d8515465cad89ed83794c3d3f9 (diff)
downloadansible-7ec84394f98accc66c702416dc4dc70347d5f8a4.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 bfe375dc78..609dc81aba 100644
--- a/lib/ansible/template/__init__.py
+++ b/lib/ansible/template/__init__.py
@@ -384,7 +384,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"):