Update to <?xml version="1.1"
This commit is contained in:
parent
866ffd39f6
commit
7b06c9855c
@ -228,7 +228,7 @@ class AccountController(object):
|
||||
(name, object_count, bytes_used))
|
||||
account_list = '[' + ','.join(json_out) + ']'
|
||||
elif out_content_type.endswith('/xml'):
|
||||
output_list = ['<?xml version="1.0" encoding="UTF-8"?>',
|
||||
output_list = ['<?xml version="1.1" encoding="UTF-8"?>',
|
||||
'<account name="%s">' % account]
|
||||
for (name, object_count, bytes_used, is_subdir) in account_list:
|
||||
name = saxutils.escape(name, XML_EXTRA_ENTITIES)
|
||||
|
@ -330,7 +330,7 @@ class ContainerController(object):
|
||||
'<last_modified>%s</last_modified></object>' % \
|
||||
(name, etag, size, content_type, created_at))
|
||||
container_list = ''.join([
|
||||
'<?xml version="1.0" encoding="UTF-8"?>\n',
|
||||
'<?xml version="1.1" encoding="UTF-8"?>\n',
|
||||
'<container name=%s>' %
|
||||
saxutils.quoteattr(container, XML_EXTRA_ENTITIES),
|
||||
''.join(xml_output), '</container>'])
|
||||
|
@ -608,7 +608,7 @@ class TestContainerController(unittest.TestCase):
|
||||
'HTTP_X_SIZE': 0})
|
||||
resp = self.controller.PUT(req)
|
||||
self.assertEquals(resp.status_int, 201)
|
||||
xml_body = '<?xml version="1.0" encoding="UTF-8"?>\n' \
|
||||
xml_body = '<?xml version="1.1" encoding="UTF-8"?>\n' \
|
||||
'<container name="xmlc">' \
|
||||
'<object><name>0</name><hash>x</hash><bytes>0</bytes>' \
|
||||
'<content_type>text/plain</content_type>' \
|
||||
@ -752,7 +752,7 @@ class TestContainerController(unittest.TestCase):
|
||||
req = Request.blank('/sda1/p/a/c?prefix=US-&delimiter=-&format=xml',
|
||||
environ={'REQUEST_METHOD': 'GET'})
|
||||
resp = self.controller.GET(req)
|
||||
self.assertEquals(resp.body, '<?xml version="1.0" encoding="UTF-8"?>'
|
||||
self.assertEquals(resp.body, '<?xml version="1.1" encoding="UTF-8"?>'
|
||||
'\n<container name="c"><subdir name="US-OK-"><name>US-OK-</name></subdir>'
|
||||
'<subdir name="US-TX-"><name>US-TX-</name></subdir>'
|
||||
'<subdir name="US-UT-"><name>US-UT-</name></subdir></container>')
|
||||
|
Loading…
x
Reference in New Issue
Block a user