From d79600c1029ab91de8a81809df9efddc762351c0 Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Fri, 7 Jan 2011 16:42:38 -0800
Subject: small cleanups

---
 nova/api/openstack/servers.py | 2 +-
 nova/db/sqlalchemy/models.py  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 0953b01ed..3f0fdc575 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -49,7 +49,7 @@ def _translate_detail_keys(inst):
         power_state.SHUTOFF: 'active',
         power_state.CRASHED: 'error'}
     inst_dict = {}
-    print inst
+
     mapped_keys = dict(status='state', imageId='image_id',
         flavorId='instance_type', name='display_name', id='id')
 
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 14cf7f617..d730a0ebc 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -90,7 +90,9 @@ class NovaBase(object):
             setattr(self, k, v)
 
     def iteritems(self):
-        """Make the model object behave like a dict"""
+        """Make the model object behave like a dict.
+        
+        Includes attributes from joins."""
         local = dict(self)
         joined = dict([(k, v) for k, v in self.__dict__.iteritems()
                       if not k[0] == '_'])
-- 
cgit