diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-19 15:29:35 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-19 15:29:35 -0500 |
| commit | a7165d76efe048acba68c607ed4a1f9ebb44a659 (patch) | |
| tree | 3d42d4345fbf8b2d0078f9db0c50e28f0a934294 /nova/api | |
| parent | c58a8edb5c282f661d5be361ce68131516c741ba (diff) | |
| parent | 1b6a78910aa959dd0a51502da7e8d1505e871ffd (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) |