a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Testing whether this fixes jenkins

pull/4420/head
Toshio Kuratomi 2016-03-02 07:47:10 -08:00
parent 2cd52604e2
commit 5aef65edcd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ansible/template/__init__.py
View File

@ -24,9 +24,6 @@ import contextlib
import os import os
import re import re
try:
from StringIO import StringIO
except ImportError:
from io import StringIO from io import StringIO
from ansible.compat.six import string_types, text_type, binary_type from ansible.compat.six import string_types, text_type, binary_type
@ -293,10 +290,17 @@ class Templar:
# Don't template unsafe variables, instead drop them back down to their constituent type. # Don't template unsafe variables, instead drop them back down to their constituent type.
if hasattr(variable, '__UNSAFE__'): if hasattr(variable, '__UNSAFE__'):
if isinstance(variable, text_type): if isinstance(variable, text_type):
return self._clean_data(text_type(variable)) return self._clean_data(variable)
elif isinstance(variable, binary_type): elif isinstance(variable, binary_type):
return self._clean_data(bytes(variable)) # If we're unicode sandwiching, then we shouldn't get here but
# seems like we are. Will have to decide whether to turn them
# into text_type instead
raise AnsibleError("variable is str: %s" % variable)
#elif isinstance(variable, binary_type):
# return self._clean_data(bytes(variable))
else: else:
# Do we need to convert these into text_type as well?
# return self._clean_data(to_unicode(variable._obj, nonstring='passthru'))
return self._clean_data(variable._obj) return self._clean_data(variable._obj)
try: try: