thuruv / awspylib Goto Github PK

What steps will reproduce the problem?
1. call put_object_from_file with check hash = true
2. the app will loop forever
3.

What is the expected output? What do you see instead?
if the hash check is correct, then done

What version of the product are you using? On what operating system?
/trunk/awspylib/aws_s3/s3_util.py - r30     

Please provide any additional information below.
Because the numTries has no chance to be increased to reach _NUMBER_OF_RETRIES 
if there is no error or there isn't break in case check hash = true

Should add an additional else: break for the if ( resp._get_etag_( ) != h ):

def put_object_from_file (self, fileName):      
while numTries < _NUMBER_OF_RETRIES_: 
854 if (Config.AWSProperties['CheckHash'] == True):
855     if ( resp._get_etag_( ) != h ):
858         numTries += 1
859     else:
860         break
861 else:
862     break

I modified s3_util.py to use the mimetypes module:

top of file add:
from mimetypes import guess_type

and in s3_util.py _stream_data_from_file_

change:
headers['content-type'] = 'application/octet-stream'

to:
headers['content-type'] = guess_type(fileName)[0]

Need the ability to specify ACLs on keys. I simply modified s3_util.py as
follows:

def put_object_from_file (self, fileName, **headers):
def _stream_data_from_file_(self, fileName, headers = None):
    if not headers: headers = {}

and call as follows:
k.put_object_from_file(f, x-amz-acl="public-read")

[email protected]