summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-09-21 19:27:14 +0000
committerTarmac <>2011-09-21 19:27:14 +0000
commitd9752d46554ffa87360bfd740177b40871cfbea6 (patch)
tree5c4fa149c1811995b365a7c30ce1b9153112dcde /nova/api
parent14068bc8f748ee3bee3c5b86ac19cd21b0ff8b67 (diff)
parent43f59d597c8c7e4cabe4f2dd3e7f9eeddff450e6 (diff)
downloadnova-d9752d46554ffa87360bfd740177b40871cfbea6.tar.gz
nova-d9752d46554ffa87360bfd740177b40871cfbea6.tar.xz
nova-d9752d46554ffa87360bfd740177b40871cfbea6.zip
Fix keys in ec2 conversion to make sure not to use 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