Changeset 7013

Timestamp:

May 11, 2009, 4:18:30 PM (16 years ago)

Author:

rwilson

Message:

Made md5/hashlib changeover transparent. hashlib used if available.

File:

• anuga_core/source/anuga/utilities/system_tools.py (modified) (2 diffs)

anuga_core/source/anuga/utilities/system_tools.py

@@ -10 +10 @@
 import getpass
 import tarfile
-import md5
+try:
+    import hashlib
+except ImportError:
+    import md5 as hashlib
 
 
@@ -478 +481 @@
 def get_file_hexdigest(filename, blocksize=1024*1024*10):
     '''Get a hex digest of a file.'''
-    
-    m = md5.new()
+
+    if hashlib.__name__ == 'hashlib':
+        m = hashlib.md5()       # new - 'hashlib' module
+    else:
+        m = hashlib.new()       # old - 'md5' module - remove once py2.4 gone
     fd = open(filename, 'r')