Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
diff --git a/tools/merge-event-log-tags.py b/tools/merge-event-log-tags.py
index bddda90..64bad3f 100755
--- a/tools/merge-event-log-tags.py
+++ b/tools/merge-event-log-tags.py
@@ -26,7 +26,10 @@
import cStringIO
import getopt
-import md5
+try:
+ import hashlib
+except ImportError:
+ import md5 as hashlib
import struct
import sys
@@ -141,7 +144,7 @@
# versions of python. Using md5 is overkill here but is the same from
# platform to platform and speed shouldn't matter in practice.
def hashname(str):
- d = md5.md5(str).digest()[:4]
+ d = hashlib.md5(str).digest()[:4]
return struct.unpack("!I", d)[0]
# Assign a tag number to all the entries that say they want one
