diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-19 12:40:03 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-19 12:40:03 -0800 |
| commit | 9f84019339c6e90dfa517de2bc08ee3e6ab643a9 (patch) | |
| tree | ee4d5ce6870aac88e3ed540d7e3d1713f0f38213 /nova/api | |
| parent | 6a0512f440f196223a857e7f5e92fe5a8cc7e2a2 (diff) | |
| parent | ff9ec3576c4efb24baa657405591ead991ea1287 (diff) | |
merge trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/direct.py | 2 |
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) |