--- Hash/HMAC.py.old	2002-07-25 13:19:02.000000000 -0400
+++ Hash/HMAC.py	2009-02-07 12:32:36.000000000 -0500
@@ -33,8 +33,8 @@
         digestmod: A module supporting PEP 247. Defaults to the md5 module.
         """
         if digestmod == None:
-            import md5
-            digestmod = md5
+            import MD5
+            digestmod = MD5
 
         self.digestmod = digestmod
         self.outer = digestmod.new()
--- Hash/MD5.py.old	2002-07-11 10:31:19.000000000 -0400
+++ Hash/MD5.py	2009-02-07 12:50:48.000000000 -0500
@@ -3,11 +3,10 @@
 
 __revision__ = "$Id: MD5.py,v 1.4 2002/07/11 14:31:19 akuchling Exp $"
 
-from md5 import *
+import hashlib
 
-import md5
-if hasattr(md5, 'digestsize'):
-    digest_size = digestsize
-    del digestsize
-del md5
+new = hashlib.md5
+md5 = hashlib.md5
 
+blocksize = hashlib.md5().block_size
+digest_size = hashlib.md5().digest_size
--- Hash/SHA.py.old	2002-07-11 10:31:19.000000000 -0400
+++ Hash/SHA.py	2009-02-07 12:50:17.000000000 -0500
@@ -3,9 +3,10 @@
 
 __revision__ = "$Id: SHA.py,v 1.4 2002/07/11 14:31:19 akuchling Exp $"
 
-from sha import *
-import sha
-if hasattr(sha, 'digestsize'):
-    digest_size = digestsize
-    del digestsize
-del sha
+import hashlib
+
+new = hashlib.sha1 
+sha = hashlib.sha1
+
+blocksize = hashlib.sha1().block_size
+digest_size = hashlib.sha1().digest_size
o