Commit 039d4c95 by James Cammarata

Merge pull request #4221 from ashorin/unicode-md5

Prevent UnicodeEncodeError: 'ascii' codec can't encode characters in pos...
parents 0ee236bf fd101dd2
...@@ -408,9 +408,11 @@ def merge_hash(a, b): ...@@ -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()) try:
digest.update(data)
except UnicodeEncodeError:
digest.update(data.encode('utf-8'))
return digest.hexdigest() return digest.hexdigest()
def md5(filename): def md5(filename):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment