Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages 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
parent fe090d7bb5
commit 075d008509
2 changed files with 11 additions and 7 deletions
Show Stats 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) return template.render(buckets=all_buckets)
def subdomain_based_buckets(self, request): def subdomain_based_buckets(self, request):
host = request.headers['host'] host = request.headers.get('host', request.headers.get('Host'))
if host.startswith("localhost"): if host.startswith("localhost"):
# For localhost, default to path-based buckets # For localhost, default to path-based buckets
return False 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): def is_delete_keys(self, request, path, bucket_name):
if self.subdomain_based_buckets(request): if self.subdomain_based_buckets(request):

12
moto/s3/urls.py
View File

@ -1,4 +1,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from moto.compat import OrderedDict
from .responses import S3ResponseInstance from .responses import S3ResponseInstance
url_bases = [ url_bases = [
@ -6,13 +8,13 @@ url_bases = [
"https?://(?P<bucket_name>[a-zA-Z0-9\-_.]*)\.?s3(.*).amazonaws.com" "https?://(?P<bucket_name>[a-zA-Z0-9\-_.]*)\.?s3(.*).amazonaws.com"
] ]
url_paths = { url_paths = OrderedDict([
# subdomain bucket # subdomain bucket
'{0}/$': S3ResponseInstance.bucket_response, ('{0}/$', S3ResponseInstance.bucket_response),
# subdomain key of path-based bucket # subdomain key of path-based bucket
'{0}/(?P<key_or_bucket_name>.+)': S3ResponseInstance.ambiguous_response, ('{0}/(?P<key_or_bucket_name>.+)', S3ResponseInstance.ambiguous_response),
# path-based bucket + key # path-based bucket + key
'{0}/(?P<bucket_name_path>[a-zA-Z0-9\-_./]+)/(?P<key_name>.+)': S3ResponseInstance.key_response, ('{0}/(?P<bucket_name_path>[a-zA-Z0-9\-_./]+)/(?P<key_name>.+)', S3ResponseInstance.key_response),
} ])