openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Python3: webob.Response.body must be bytes"

Browse Source
This commit is contained in:
Jenkins
2014-02-08 23:23:37 +00:00
committed by Gerrit Code Review
parent 11165bf23d 9a2844e2d9
commit 2a3af3f215
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
keystoneclient/middleware/s3_token.py
View File

@@ -38,6 +38,7 @@ import urllib
import webob import webob
import requests import requests
import six
from keystoneclient.openstack.common import jsonutils from keystoneclient.openstack.common import jsonutils
@@ -134,11 +135,13 @@ class S3Token(object):
} }
resp = webob.Response(content_type='text/xml') resp = webob.Response(content_type='text/xml')
resp.status = error_table[code][0] resp.status = error_table[code][0]
resp.body = error_table[code][1] error_msg = ('<?xml version="1.0" encoding="UTF-8"?>\r\n'
resp.body = ('<?xml version="1.0" encoding="UTF-8"?>\r\n'
'<Error>\r\n <Code>%s</Code>\r\n ' '<Error>\r\n <Code>%s</Code>\r\n '
'<Message>%s</Message>\r\n</Error>\r\n' % '<Message>%s</Message>\r\n</Error>\r\n' %
(code, error_table[code][1])) (code, error_table[code][1]))
if six.PY3:
error_msg = error_msg.encode()
resp.body = error_msg
return resp return resp
def _json_request(self, creds_json): def _json_request(self, creds_json):