ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Remove debugging and fix the place where bytes are being handed to StringIO

Browse source
This commit is contained in:
Toshio Kuratomi 2016-03-02 09:31:06 -08:00
parent 093b3422ec
commit 1dbbd2a80c
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/template/__init__.py
View file

@ -40,6 +40,7 @@ from ansible.template.safe_eval import safe_eval
from ansible.template.template import AnsibleJ2Template from ansible.template.template import AnsibleJ2Template
from ansible.template.vars import AnsibleJ2Vars from ansible.template.vars import AnsibleJ2Vars
from ansible.utils.debug import debug from ansible.utils.debug import debug
from ansible.utils.unicode import to_unicode
try: try:
from hashlib import sha1 from hashlib import sha1
@ -255,10 +256,10 @@ class Templar:
if prev_idx is not None: if prev_idx is not None:
# replace the opening # replace the opening
data.seek(prev_idx, os.SEEK_SET) data.seek(prev_idx, os.SEEK_SET)
data.write(self.environment.comment_start_string) data.write(to_unicode(self.environment.comment_start_string))
# replace the closing # replace the closing
data.seek(token_start, os.SEEK_SET) data.seek(token_start, os.SEEK_SET)
data.write(self.environment.comment_end_string) data.write(to_unicode(self.environment.comment_end_string))
else: else:
raise AnsibleError("Error while cleaning data for safety: unhandled regex match") raise AnsibleError("Error while cleaning data for safety: unhandled regex match")
@ -291,13 +292,6 @@ class Templar:
if hasattr(variable, '__UNSAFE__'): if hasattr(variable, '__UNSAFE__'):
if isinstance(variable, text_type): if isinstance(variable, text_type):
return self._clean_data(variable) return self._clean_data(variable)
elif isinstance(variable, binary_type):
# 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? # 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(to_unicode(variable._obj, nonstring='passthru'))
@ -504,8 +498,7 @@ class Templar:
) )
else: else:
debug("failing because of a type error, template data is: %s" % data) debug("failing because of a type error, template data is: %s" % data)
import traceback raise AnsibleError("an unexpected type error occurred. Error was %s" % te)
raise AnsibleError("an unexpected type error occurred. Error was %s, tracback: %s" % (te, traceback.format_exc()))
if preserve_trailing_newlines: if preserve_trailing_newlines:
# The low level calls above do not preserve the newline # The low level calls above do not preserve the newline