From 70e10503472d37f08f9f0880c87e10afc3abc851 Mon Sep 17 00:00:00 2001
From: root <root@ubuntu>
Date: Thu, 18 Nov 2010 10:52:54 -0800
Subject: Make sure that the response body is a string and not unicode

---
 nova/api/ec2/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/api')

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
-- 
cgit