cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix python3 test.

Browse source
This commit is contained in:
Yannig Perré 2015-11-03 11:52:09 +01:00
parent 130139dc80
commit 30f827d92d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -310,7 +310,9 @@ class Templar:
return C.DEFAULT_NULL_REPRESENTATION
# Using a cache in order to prevent template calls with already templated variables
sha1_hash = sha1(variable.encode('utf-8') + str(preserve_trailing_newlines) + str(escape_backslashes) + str(fail_on_undefined) + str(overrides)).hexdigest()
variable_hash = sha1(text_type(variable).encode('utf-8'))
options_hash = sha1((text_type(preserve_trailing_newlines) + text_type(escape_backslashes) + text_type(fail_on_undefined) + text_type(overrides)).encode('utf-8'))
sha1_hash = variable_hash.hexdigest() + options_hash.hexdigest()
if sha1_hash in self._cached_result:
result = self._cached_result[sha1_hash]
else:

2
lib/ansible/vars/hostvars.py
View file

@ -76,7 +76,7 @@ class HostVars(collections.Mapping):
data = self._variable_manager.get_vars(loader=self._loader, host=host, play=self._play, include_hostvars=False)
# Using cache in order to avoid template call
sha1_hash = sha1(str(data)).hexdigest()
sha1_hash = sha1(str(data).encode('utf-8')).hexdigest()
if sha1_hash in self._cached_result:
result = self._cached_result[sha1_hash]
else: