summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorroot <root@ubuntu>2010-11-18 10:52:54 -0800
committerroot <root@ubuntu>2010-11-18 10:52:54 -0800
commit70e10503472d37f08f9f0880c87e10afc3abc851 (patch)
tree8ea72d1c50d0dd3adbcb9ea80e766330c984c010 /nova/api
parentff9b3b49090773070439d37df3149727fc7d3988 (diff)
Make sure that the response body is a string and not unicode
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index b7664ec71..a6ee16c33 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -244,8 +244,8 @@ class Executor(wsgi.Application):
resp = webob.Response()
resp.status = 400
resp.headers['Content-Type'] = 'text/xml'
- resp.body = ('<?xml version="1.0"?>\n'
+ resp.body = str('<?xml version="1.0"?>\n'
'<Response><Errors><Error><Code>%s</Code>'
'<Message>%s</Message></Error></Errors>'
- '<RequestID>?</RequestID></Response>') % (code, message)
+ '<RequestID>?</RequestID></Response>' % (code, message))
return resp