summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-22 15:32:29 +0000
committerGerrit Code Review <review@openstack.org>2012-02-22 15:32:29 +0000
commit861c0d9e214aed8ba6633aff56270d05fa69e640 (patch)
tree9589457ba03c126d2b7a8368b6841fae9919860d /nova
parent55fb5df69d475ffdb6f2d953cedf899afaace13e (diff)
parent9c1de0b4cd7b9b1c7db65798a5308ae76fad1780 (diff)
Merge "Makes HTTP Location Header return as utf-8 as opposed to Unicode."
Diffstat (limited to 'nova')
-rw-r--r--nova/api/openstack/compute/servers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 7a0141a01..5660d28f5 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -355,7 +355,7 @@ class Controller(wsgi.Controller):
link = filter(lambda l: l['rel'] == 'self',
robj.obj['server']['links'])
if link:
- robj['Location'] = link[0]['href']
+ robj['Location'] = link[0]['href'].encode('utf-8')
# Convenience return
return robj