summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Kearney <josh.kearney@rackspace.com>2010-12-29 14:15:04 -0600
committerJosh Kearney <josh.kearney@rackspace.com>2010-12-29 14:15:04 -0600
commit5b8137b2f50a4ed3eb105e38cefa280927f1c2ea (patch)
tree94fbb60d491d0402ec99fa4d5c7246200af4cd90
parent823c5fc1ff3c37acbfe9b30d7057f53b050b93c6 (diff)
downloadnova-5b8137b2f50a4ed3eb105e38cefa280927f1c2ea.tar.gz
nova-5b8137b2f50a4ed3eb105e38cefa280927f1c2ea.tar.xz
nova-5b8137b2f50a4ed3eb105e38cefa280927f1c2ea.zip
PEP8 cleanup
-rw-r--r--nova/db/sqlalchemy/api.py2
-rw-r--r--nova/virt/xenapi/vmops.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 5fd928a79..8e68d12a4 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -865,7 +865,7 @@ def instance_get_actions(context, instance_id):
filter_by(instance_id=instance_id).\
all():
actions[action.action] = action.error
- return actions
+ return actions
###################
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 93f7f7695..1dfb9005c 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -232,7 +232,9 @@ class VMOps(object):
if vm is None:
raise exception.NotFound(_("Instance not found %s") %
instance.name)
- return db.instance_get_actions(context.get_admin_context(), instance.id)
+ return db.instance_get_actions(
+ context.get_admin_context(),
+ instance.id)
def get_console_output(self, instance):
"""Return snapshot of console"""