summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-01-19 19:59:19 +0000
committerTarmac <>2011-01-19 19:59:19 +0000
commit1b6a78910aa959dd0a51502da7e8d1505e871ffd (patch)
tree29fa88066149cad30f730b26d9f638cd9188adf8 /nova/api
parentf28b7aa6fc51fcbae3c82b88f6e946124b1f2a98 (diff)
parentbeff00fbe9b9e05e265f3c4ce5b6670426e22de2 (diff)
Fixes **params unpacking to ensure all kwargs are strings for compatibility with python 2.6.1
Diffstat (limited to 'nova/api')
-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)