Merge pull request #4221 from ashorin/unicode-md5
Prevent UnicodeEncodeError: 'ascii' codec can't encode characters in pos...
This commit is contained in:
commit
039d4c95d9
1 changed files with 4 additions and 2 deletions
|
@ -408,9 +408,11 @@ def merge_hash(a, b):
|
|||
def md5s(data):
|
||||
''' Return MD5 hex digest of data. '''
|
||||
|
||||
buf = StringIO.StringIO(data)
|
||||
digest = _md5()
|
||||
digest.update(buf.read())
|
||||
try:
|
||||
digest.update(data)
|
||||
except UnicodeEncodeError:
|
||||
digest.update(data.encode('utf-8'))
|
||||
return digest.hexdigest()
|
||||
|
||||
def md5(filename):
|
||||
|
|
Loading…
Reference in a new issue