summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-04-07 15:52:14 -0400
committerDan Prince <dan.prince@rackspace.com>2011-04-07 15:52:14 -0400
commitc7fd470d7ff0df4b23664b6599e5ae5acdb21511 (patch)
tree6325780d2932854a44c292934ef1e4389e873d35
parent99e8335e9b07b1cbf9c28cda2dfb2496d955c72c (diff)
Drop extra 'None' arg from dict.get call.
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index e4bcccb2b..c3124b89d 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -731,7 +731,7 @@ class CloudController(object):
instance['host'])
i['productCodesSet'] = self._convert_to_set([], 'product_codes')
if instance['instance_type']:
- i['instanceType'] = instance['instance_type'].get('name', None)
+ i['instanceType'] = instance['instance_type'].get('name')
else:
i['instanceType'] = None
i['launchTime'] = instance['created_at']