summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-03-16 17:24:32 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-03-16 17:24:32 -0400
commit05ccc91bdb3ad47ffecee29d21835ded17f65816 (patch)
treea24ffa67f8b88c2ca300caa30ff79e3a3554b554 /nova
parentbb606c7ba42fc567f2e9989e0f560783743e5ddd (diff)
pep8
Diffstat (limited to 'nova')
-rw-r--r--nova/api/openstack/views/flavors.py4
-rw-r--r--nova/tests/api/openstack/test_flavors.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/nova/api/openstack/views/flavors.py b/nova/api/openstack/views/flavors.py
index be7e68763..7d75c0aa2 100644
--- a/nova/api/openstack/views/flavors.py
+++ b/nova/api/openstack/views/flavors.py
@@ -61,8 +61,8 @@ class ViewBuilder(object):
detail.update(simple)
- return detail
-
+ return detail
+
def _build_extra(self, flavor_obj):
return flavor_obj
diff --git a/nova/tests/api/openstack/test_flavors.py b/nova/tests/api/openstack/test_flavors.py
index 8dfcfe293..954d72adf 100644
--- a/nova/tests/api/openstack/test_flavors.py
+++ b/nova/tests/api/openstack/test_flavors.py
@@ -46,6 +46,7 @@ def return_instance_types(context, num=2):
instance_types[name] = stub_flavor(i, name)
return instance_types
+
def return_instance_type_not_found(context, flavorid):
raise exception.NotFound()
@@ -205,7 +206,7 @@ class FlavorsTest(test.TestCase):
],
},
]
- self.assertEqual(flavor, expected)
+ self.assertEqual(flavor, expected)
def test_get_flavor_list_detail_v1_1(self):
req = webob.Request.blank('/v1.1/flavors/detail')