@@ -, +, @@ 
---
--- a/Hash/MD5.py	
+++ a/Hash/MD5.py	
@@ -3,11 +3,21 @@ 
 
 __revision__ = "$Id$"
 
-from md5 import *
+__all__ = ['new', 'digest_size']
 
-import md5
-if hasattr(md5, 'digestsize'):
-    digest_size = digestsize
-    del digestsize
-del md5
+try:
+    # The md5 module is deprecated in Python 2.6, so use hashlib when possible.
+    import hashlib
+    def new(data=""):
+        return hashlib.md5(data)
+    digest_size = new().digest_size
+
+except ImportError:
+    from md5 import *
+
+    import md5
+    if hasattr(md5, 'digestsize'):
+        digest_size = digestsize
+        del digestsize
+    del md5
 
--- a/Hash/SHA.py	
+++ a/Hash/SHA.py	
@@ -3,9 +3,19 @@ 
 
 __revision__ = "$Id$"
 
-from sha import *
-import sha
-if hasattr(sha, 'digestsize'):
-    digest_size = digestsize
-    del digestsize
-del sha
+__all__ = ['new', 'digest_size']
+
+try:
+    # The md5 module is deprecated in Python 2.6, so use hashlib when possible.
+    import hashlib
+    def new(data=""):
+        return hashlib.sha1(data)
+    digest_size = new().digest_size
+
+except ImportError:
+    from sha import *
+    import sha
+    if hasattr(sha, 'digestsize'):
+        digest_size = digestsize
+        del digestsize
+    del sha
---
--- a/Hash/HMAC.py	
+++ a/Hash/HMAC.py	
@@ -33,8 +33,8 @@ class HMAC:
         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()