summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJosh Kearney <josh.kearney@rackspace.com>2011-01-19 14:57:42 -0600
committerJosh Kearney <josh.kearney@rackspace.com>2011-01-19 14:57:42 -0600
commite8748afd0773e2599aaa9898d6fe4ef850d6fe5a (patch)
tree02ae4007143cd5029d7f8285ed00e02fa6ad19d5 /nova
parent76e88b6c1139640fede5150b58d2e3427a582a8a (diff)
parentff9ec3576c4efb24baa657405591ead991ea1287 (diff)
downloadnova-e8748afd0773e2599aaa9898d6fe4ef850d6fe5a.tar.gz
nova-e8748afd0773e2599aaa9898d6fe4ef850d6fe5a.tar.xz
nova-e8748afd0773e2599aaa9898d6fe4ef850d6fe5a.zip
Merged trunk
Diffstat (limited to 'nova')
-rw-r--r--nova/api/direct.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/direct.py b/nova/api/direct.py
index 81b3ae202..509ab3ae0 100644
--- a/nova/api/direct.py
+++ b/nova/api/direct.py
@@ -196,6 +196,8 @@ class ServiceWrapper(wsgi.Controller):
# TODO(termie): do some basic normalization on methods
method = getattr(self.service_handle, action)
+ # NOTE(vish): make sure we have no unicode keys for py2.6.
+ params = dict([(str(k), v) for (k, v) in params.iteritems()])
result = method(context, **params)
if type(result) is dict or type(result) is list:
return self._serialize(result, req)