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

12
moto/s3/urls.py
View file

@ -1,4 +1,6 @@
from __future__ import unicode_literals
from moto.compat import OrderedDict
from .responses import S3ResponseInstance
url_bases = [
@ -6,13 +8,13 @@ url_bases = [
"https?://(?P<bucket_name>[a-zA-Z0-9\-_.]*)\.?s3(.*).amazonaws.com"
]
url_paths = {
url_paths = OrderedDict([
# subdomain bucket
'{0}/$': S3ResponseInstance.bucket_response,
('{0}/$', S3ResponseInstance.bucket_response),
# 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
'{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),
])