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

fix errors

Browse Source
This commit is contained in:
Alexander Mohr 2018-05-03 01:40:49 -07:00
parent 22b0298ff9
commit 7a57dc2034
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
moto/s3/models.py
View File

@ -859,6 +859,9 @@ class S3Backend(BaseBackend):
if str(key.version_id) != str(version_id) if str(key.version_id) != str(version_id)
] ]
) )
if not bucket.keys.getlist(key_name):
bucket.keys.pop(key_name)
return True return True
except KeyError: except KeyError:
return False return False

8
moto/s3/responses.py
View File

@ -24,7 +24,6 @@ from xml.dom import minidom
DEFAULT_REGION_NAME = 'us-east-1' DEFAULT_REGION_NAME = 'us-east-1'
def parse_key_name(pth): def parse_key_name(pth):
return pth.lstrip("/") return pth.lstrip("/")
@ -706,8 +705,11 @@ class ResponseObject(_TemplateEnvironmentMixin):
if 'x-amz-copy-source' in request.headers: if 'x-amz-copy-source' in request.headers:
# Copy key # Copy key
src_key_parsed = urlparse(unquote(request.headers.get("x-amz-copy-source"))) # you can have a quoted ?version=abc with a version Id, so work on
src_bucket, src_key = src_key_parsed.path.lstrip("/").split("/", 1) # we need to parse the unquoted string first
src_key_parsed = urlparse(request.headers.get("x-amz-copy-source"))
src_bucket, src_key = unquote(src_key_parsed.path).\
lstrip("/").split("/", 1)
src_version_id = parse_qs(src_key_parsed.query).get( src_version_id = parse_qs(src_key_parsed.query).get(
'versionId', [None])[0] 'versionId', [None])[0]
self.backend.copy_key(src_bucket, src_key, bucket_name, key_name, self.backend.copy_key(src_bucket, src_key, bucket_name, key_name,