summaryrefslogtreecommitdiff
path: root/libjava/contrib
diff options
context:
space:
mode:
authordoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-23 14:25:33 +0000
committerdoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-23 14:25:33 +0000
commitd2bb4bcb06fc3a590d434a51d4e6fd100e466678 (patch)
tree178c970a137f6376c37bd7319cfd7ed44950b4c5 /libjava/contrib
parentb0e684c847dae0269be7dcc39181e1adaeed1e6a (diff)
downloadgcc-d2bb4bcb06fc3a590d434a51d4e6fd100e466678.tar.gz
2009-07-23 Matthias Klose <doko@ubuntu.com>
* contrib/aotcompile.py.in: Use hashlib instead of md5 if available. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150010 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/contrib')
-rw-r--r--libjava/contrib/aotcompile.py.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/libjava/contrib/aotcompile.py.in b/libjava/contrib/aotcompile.py.in
index 9db08d2b59c..17a2dd68ea8 100644
--- a/libjava/contrib/aotcompile.py.in
+++ b/libjava/contrib/aotcompile.py.in
@@ -15,7 +15,11 @@
import classfile
import copy
-import md5
+# The md5 module is deprecated in Python 2.5
+try:
+ from hashlib import md5
+except ImportError:
+ from md5 import md5
import operator
import os
import sys
@@ -182,7 +186,7 @@ class Job:
def addClass(self, bytes, name):
"""Subclasses call this from their __init__ method for
every class they find."""
- digest = md5.new(bytes).digest()
+ digest = md5(bytes).digest()
self.classes[digest] = bytes
self.classnames[digest] = name