diff options
| author | Doug Zongker <dougz@google.com> | 2012-09-20 12:02:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-20 12:02:24 -0700 |
| commit | c4d68391cc39e56b1471a3f5a8d1efbc123503e6 (patch) | |
| tree | de475efe45d7d31afa5aaa2730af1b3ae9058565 | |
| parent | 295cf570d65b52bcc1875be2bfc234af202156f0 (diff) | |
| parent | 6ce87a1fc87873510e571c08d5995773a16cddf1 (diff) | |
| download | build-c4d68391cc39e56b1471a3f5a8d1efbc123503e6.zip build-c4d68391cc39e56b1471a3f5a8d1efbc123503e6.tar.gz build-c4d68391cc39e56b1471a3f5a8d1efbc123503e6.tar.bz2 | |
Merge "fix merge-event-log-tags.py deprecation warning" into jb-mr1-dev
| -rwxr-xr-x | tools/merge-event-log-tags.py | 7 |
1 files changed, 5 insertions, 2 deletions
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 @@ and fails if they do. import cStringIO import getopt -import md5 +try: + import hashlib +except ImportError: + import md5 as hashlib import struct import sys @@ -141,7 +144,7 @@ if warnings: # 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 |