@@ -1,7 +1,7 @@

 2009-01-01  W. Tell  <w_tell -at- sourceforge>

 	* S3/S3.py, S3/Utils.py: Use 'hashlib' instead of md5 and sha 

-	  modules to avoid Python 2.6 warnings.

+	  modules to avoid Python 2.6 warnings. 

 2008-12-31  Michal Ludvig  <michal@logix.cz>

@@ -16,8 +16,8 @@ from stat import ST_SIZE

 try:

 	from hashlib import md5, sha1

 except ImportError:

-	import md5

-	import sha as sha1

+	from md5 import md5

+	from sha import sha as sha1

 import hmac

 from Utils import *

@@ -9,9 +9,9 @@ import re

 import string

 import random

 try:

-	import hashlib as hash

+	from hashlib import md5

 except ImportError:

-	import md5 as hash

+	from md5 import md5

 import errno

 from logging import debug, info, warning, error

@@ -149,7 +149,7 @@ def mktmpfile(prefix = "/tmp/tmpfile-", randchars = 20):

 	return mktmpsomething(prefix, randchars, createfunc)

 def hash_file_md5(filename):

-	h = hash.md5()

+	h = md5()

 	f = open(filename, "rb")

 	while True:

 		# Hash 32kB chunks