Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporary fix to allow for writing empty strings to s3 keys. Closes #6.

Browse Source
This commit is contained in:
Steve Pulec 2013-03-26 09:02:04 -04:00
parent e677193753
commit 756955b61e
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
moto/s3/responses.py
View File

@ -80,10 +80,19 @@ def key_response(uri_info, method, body, headers):
s3_backend.copy_key(src_bucket, src_key, bucket_name, key_name)
template = Template(S3_OBJECT_COPY_RESPONSE)
return template.render(key=src_key)
if body:
new_key = s3_backend.set_key(bucket_name, key_name, body)
template = Template(S3_OBJECT_RESPONSE)
return template.render(key=new_key), dict(etag=new_key.etag)
if body is not None:
key = s3_backend.get_key(bucket_name, key_name)
if not key or body:
# We want to write the key in once of two circumstances.
# - The key does not currently exist.
# - The key already exists, but body is a truthy value.
# This allows us to write empty strings to keys for the first
# write, but not subsequent. This is because HTTPretty sends
# an empty string on connection close. This is a temporary fix
# while HTTPretty gets fixed.
new_key = s3_backend.set_key(bucket_name, key_name, body)
template = Template(S3_OBJECT_RESPONSE)
return template.render(key=new_key), dict(etag=new_key.etag)
key = s3_backend.get_key(bucket_name, key_name)
if key:
return "", dict(etag=key.etag)

11
tests/test_s3/test_s3.py
View File

@ -51,6 +51,17 @@ def test_missing_key_urllib2():
urllib2.urlopen.when.called_with("http://foobar.s3.amazonaws.com/the-key").should.throw(urllib2.HTTPError)
@mock_s3
def test_empty_key():
conn = boto.connect_s3('the_key', 'the_secret')
bucket = conn.create_bucket("foobar")
key = Key(bucket)
key.key = "the-key"
key.set_contents_from_string("")
bucket.get_key("the-key").get_contents_as_string().should.equal('')
@mock_s3
def test_copy_key():
conn = boto.connect_s3('the_key', 'the_secret')