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

Change s3 urls to ordereddict to fix python3 issues.

Browse source
This commit is contained in:
Steve Pulec 2016-01-17 17:19:53 -05:00
commit 075d008509
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
moto/s3/responses.py
View file

@ -40,11 +40,13 @@ class ResponseObject(_TemplateEnvironmentMixin):
return template.render(buckets=all_buckets)
def subdomain_based_buckets(self, request):
host = request.headers['host']
host = request.headers.get('host', request.headers.get('Host'))
if host.startswith("localhost"):
# For localhost, default to path-based buckets
return False
return host != 's3.amazonaws.com' and not re.match("s3.(.*).amazonaws.com", host)
path_based = (host == 's3.amazonaws.com' or re.match("s3.(.*).amazonaws.com", host))
return not path_based
def is_delete_keys(self, request, path, bucket_name):
if self.subdomain_based_buckets(request):