openstack/vitrage
Code Issues Proposed changes

Merge "Bug fix: calculate md5 on non-unicode strings"

Browse Source
This commit is contained in:
Zuul
2018-08-09 12:07:46 +00:00
committed by Gerrit Code Review
parent 0ff1e80857 ab6393e36f
commit 82ec63abea
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vitrage/common/utils.py
View File

@@ -93,9 +93,13 @@ def spawn(target, *args, **kwargs):
def md5(obj): def md5(obj):
if isinstance(obj, tuple): if isinstance(obj, tuple):
obj = str(obj) obj = str([str(o) for o in obj])
if isinstance(obj, six.string_types): if isinstance(obj, six.string_types):
return hashlib.md5(six.b(obj)).hexdigest() if six.PY2:
return hashlib.md5(obj).hexdigest()
else:
return hashlib.md5(obj.encode('utf-8')).hexdigest()
raise Exception('Unknown object for md5 %s', str(obj)) raise Exception('Unknown object for md5 %s', str(obj))