catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Test out py26 with new HTTPretty

Browse source
This commit is contained in:
Steve Pulec 2013-10-03 20:34:13 -04:00
commit 3bddbb4af3
23 changed files with 81 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
moto/s3/models.py
View file

@ -116,7 +116,7 @@ class S3Backend(BaseBackend):
if delimiter and delimiter in key_without_prefix:
# If delimiter, we need to split out folder_results
key_without_delimiter = key_without_prefix.split(delimiter)[0]
folder_results.add("{}{}{}".format(prefix, key_without_delimiter, delimiter))
folder_results.add("{0}{1}{2}".format(prefix, key_without_delimiter, delimiter))
else:
key_results.add(key)
else:

12
moto/s3/responses.py
View file

@ -79,12 +79,12 @@ def _bucket_response(request, full_url, headers):
for kv in request.body.split('&'):
k, v = kv.split('=')
form[k] = v
key = form['key']
f = form['file']
new_key = s3_backend.set_key(bucket_name, key, f)
#Metadata
meta_regex = re.compile('^x-amz-meta-([a-zA-Z0-9\-_]+)$', flags=re.IGNORECASE)
for form_id in form:
@ -95,7 +95,7 @@ def _bucket_response(request, full_url, headers):
new_key.set_metadata(meta_key, metadata)
return 200, headers, ""
else:
raise NotImplementedError("Method {} has not been impelemented in the S3 backend yet".format(method))
raise NotImplementedError("Method {0} has not been impelemented in the S3 backend yet".format(method))
def key_response(request, full_url, headers):
@ -146,7 +146,7 @@ def _key_response(request, full_url, headers):
# Initial data
new_key = s3_backend.set_key(bucket_name, key_name, body)
request.streaming = True
#Metadata
meta_regex = re.compile('^x-amz-meta-([a-zA-Z0-9\-_]+)$', flags=re.IGNORECASE)
for header in request.headers:
@ -172,7 +172,7 @@ def _key_response(request, full_url, headers):
template = Template(S3_DELETE_OBJECT_SUCCESS)
return 204, headers, template.render(bucket=removed_key)
else:
raise NotImplementedError("Method {} has not been impelemented in the S3 backend yet".format(method))
raise NotImplementedError("Method {0} has not been impelemented in the S3 backend yet".format(method))
S3_ALL_BUCKETS = """<ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01">