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

Merge pull request #47 from rpermeh/master

Browse Source 
updated to fix split issue with paths with slashes
This commit is contained in:
Steve Pulec 2013-10-02 17:40:05 -07:00
commit 6b9ca76734
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
moto/s3/responses.py
View File

@ -79,12 +79,12 @@ def _bucket_response(request, full_url, headers):
for kv in request.body.split('&'): for kv in request.body.split('&'):
k, v = kv.split('=') k, v = kv.split('=')
form[k] = v form[k] = v
key = form['key'] key = form['key']
f = form['file'] f = form['file']
new_key = s3_backend.set_key(bucket_name, key, f) new_key = s3_backend.set_key(bucket_name, key, f)
#Metadata #Metadata
meta_regex = re.compile('^x-amz-meta-([a-zA-Z0-9\-_]+)$', flags=re.IGNORECASE) meta_regex = re.compile('^x-amz-meta-([a-zA-Z0-9\-_]+)$', flags=re.IGNORECASE)
for form_id in form: for form_id in form:
@ -130,7 +130,7 @@ def _key_response(request, full_url, headers):
if method == 'PUT': if method == 'PUT':
if 'x-amz-copy-source' in request.headers: if 'x-amz-copy-source' in request.headers:
# Copy key # Copy key
src_bucket, src_key = request.headers.get("x-amz-copy-source").split("/") src_bucket, src_key = request.headers.get("x-amz-copy-source").split("/",1)
s3_backend.copy_key(src_bucket, src_key, bucket_name, key_name) s3_backend.copy_key(src_bucket, src_key, bucket_name, key_name)
template = Template(S3_OBJECT_COPY_RESPONSE) template = Template(S3_OBJECT_COPY_RESPONSE)
return template.render(key=src_key) return template.render(key=src_key)
@ -146,7 +146,7 @@ def _key_response(request, full_url, headers):
# Initial data # Initial data
new_key = s3_backend.set_key(bucket_name, key_name, body) new_key = s3_backend.set_key(bucket_name, key_name, body)
request.streaming = True request.streaming = True
#Metadata #Metadata
meta_regex = re.compile('^x-amz-meta-([a-zA-Z0-9\-_]+)$', flags=re.IGNORECASE) meta_regex = re.compile('^x-amz-meta-([a-zA-Z0-9\-_]+)$', flags=re.IGNORECASE)
for header in request.headers: for header in request.headers: