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

Fix for buckets with periods in them. Closes #15.

Browse Source
This commit is contained in:
Steve Pulec 2013-04-13 17:28:00 -04:00
parent b7c46ae7bf
commit d96769a91c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/s3/urls.py
View File

@ -1,10 +1,10 @@
from .responses import bucket_response, key_response from .responses import bucket_response, key_response
url_bases = [ 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 = {
'{0}/$': bucket_response, '{0}/$': bucket_response,
'{0}/(?P<key_name>[a-zA-Z0-9\-_]+)': key_response, '{0}/(?P<key_name>[a-zA-Z0-9\-_.]+)': key_response,
} }

9
tests/test_s3/test_s3.py
View File

@ -196,3 +196,12 @@ def test_bucket_method_not_implemented():
@mock_s3 @mock_s3
def test_key_method_not_implemented(): def test_key_method_not_implemented():
requests.post.when.called_with("https://foobar.s3.amazonaws.com/foo").should.throw(NotImplementedError) requests.post.when.called_with("https://foobar.s3.amazonaws.com/foo").should.throw(NotImplementedError)
@mock_s3
def test_bucket_name_with_dot():
conn = boto.connect_s3()
bucket = conn.create_bucket('firstname.lastname')
k = Key(bucket, 'somekey')
k.set_contents_from_string('somedata')