summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2011-03-24 13:20:15 -0700
committertermie <github@anarkystic.com>2011-03-24 13:20:15 -0700
commitc5cbec20d2785d3060d57b55a264fbf936709500 (patch)
tree857ec7ac289584f3803c97edec8fd42fabe5095d /nova/api
parent4a6db815b01c71076bae96c155396e5adbe8af90 (diff)
pep8 cleanups
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/direct.py3
-rw-r--r--nova/api/ec2/cloud.py4
2 files changed, 5 insertions, 2 deletions
diff --git a/nova/api/direct.py b/nova/api/direct.py
index bb2ace1c9..e5f33cee4 100644
--- a/nova/api/direct.py
+++ b/nova/api/direct.py
@@ -211,7 +211,8 @@ class ServiceWrapper(wsgi.Controller):
try:
return self._serialize(result, req.best_match_content_type())
except:
- raise exception.Error("returned non-serializable type: %s" % result)
+ raise exception.Error("returned non-serializable type: %s"
+ % result)
class Limited(object):
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 5d31d71d3..0da642318 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -608,7 +608,9 @@ class CloudController(object):
if field in kwargs:
changes[field] = kwargs[field]
if changes:
- self.volume_api.update(context, volume_id=volume_id, fields=changes)
+ self.volume_api.update(context,
+ volume_id=volume_id,
+ fields=changes)
return True
def attach_volume(self, context, volume_id, instance_id, device, **kwargs):