openstack
/
ec2-api
Code Issues Proposed changes

Make S3 server compatible with AWS cli 

Change-Id: Ibeb0930db142ce5010e166355181afa711969d52
This commit is contained in:
Feodor Tersin 2015-04-08 18:21:44 +03:00
parent eaf5919fa2
commit e4333c0f59
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ec2api/s3/s3server.py
View File

@ -91,8 +91,9 @@ class S3Application(wsgi.Router):
'/{bucket}/{object_name}',
controller=lambda *a, **kw: ObjectHandler(self)(*a, **kw))
mapper.connect(
'/{bucket_name}/',
controller=lambda *a, **kw: BucketHandler(self)(*a, **kw))
'/{bucket_name}',
controller=lambda *a, **kw: BucketHandler(self)(*a, **kw),
requirements={'bucket_name': '[^/]+/?'})
self.directory = os.path.abspath(root_directory)
fileutils.ensure_tree(self.directory)
self.bucket_depth = bucket_depth
@ -174,7 +175,7 @@ class BaseRequestHandler(object):
name = value.keys()[0]
parts = []
parts.append('<' + utils.utf8(name) +
' xmlns="http://doc.s3.amazonaws.com/2006-03-01">')
' xmlns="http://s3.amazonaws.com/doc/2006-03-01/">')
self._render_parts(value.values()[0], parts)
parts.append('</' + utils.utf8(name) + '>')
self.finish('<?xml version="1.0" encoding="UTF-8"?>\n' +