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

Encode to utf-8 only when needed

Browse source
This commit is contained in:
Andrey Shorin 2013-09-25 09:15:08 +04:00
parent 21f5bc4242
commit fd101dd2d6
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/utils/__init__.py
View file

@ -408,9 +408,11 @@ def merge_hash(a, b):
def md5s(data): def md5s(data):
''' Return MD5 hex digest of data. ''' ''' Return MD5 hex digest of data. '''
buf = StringIO.StringIO(data)
digest = _md5() digest = _md5()
digest.update(buf.read().encode('utf-8')) try:
digest.update(data)
except UnicodeEncodeError:
digest.update(data.encode('utf-8'))
return digest.hexdigest() return digest.hexdigest()
def md5(filename): def md5(filename):