summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-09-21 09:34:59 -0700
committerVishvananda Ishaya <vishvananda@gmail.com>2011-09-21 09:34:59 -0700
commit43f59d597c8c7e4cabe4f2dd3e7f9eeddff450e6 (patch)
treed5fcbb3c394be6c3e12f594f7eafb81a78519fb6 /nova/api
parent67a2445265c8bce704802935b83c6e1ece805332 (diff)
downloadnova-43f59d597c8c7e4cabe4f2dd3e7f9eeddff450e6.tar.gz
nova-43f59d597c8c7e4cabe4f2dd3e7f9eeddff450e6.tar.xz
nova-43f59d597c8c7e4cabe4f2dd3e7f9eeddff450e6.zip
make sure kwargs are strings and not unicode
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/ec2utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py
index bcdf2ba78..aac8f9a1e 100644
--- a/nova/api/ec2/ec2utils.py
+++ b/nova/api/ec2/ec2utils.py
@@ -116,7 +116,7 @@ def dict_from_dotted_str(items):
args = {}
for key, value in items:
parts = key.split(".")
- key = camelcase_to_underscore(parts[0])
+ key = str(camelcase_to_underscore(parts[0]))
if isinstance(value, str) or isinstance(value, unicode):
# NOTE(vish): Automatically convert strings back
# into their respective values