From 85f50cf496e2c193ddc715f3019b4a4769ab5bd9 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Mon, 21 Mar 2011 15:14:24 -0400
Subject: pep8; various fixes

---
 nova/api/openstack/servers.py       | 1 +
 nova/api/openstack/views/servers.py | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index e3141934b..dafc096ba 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -513,6 +513,7 @@ class Controller(wsgi.Controller):
 
         return kernel_id, ramdisk_id
 
+
 class ControllerV10(Controller):
     def _image_id_from_req_data(self, data):
         return data['server']['imageId']
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 8d47ac757..078d5d484 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -67,9 +67,8 @@ class ViewBuilder(object):
 
         # Return the metadata as a dictionary
         metadata = {}
-        if 'metadata' in inst:
-            for item in inst['metadata']:
-                metadata[item['key']] = item['value']
+        for item in inst.get('metadata', []):
+            metadata[item['key']] = item['value']
         inst_dict['metadata'] = metadata
 
         inst_dict['hostId'] = ''
-- 
cgit