summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-03-28 16:54:17 -0700
committerJustin Santa Barbara <justin@fathomdb.com>2011-03-28 16:54:17 -0700
commit87bc3bca7904135656ed3a99efc19952be95dcbf (patch)
tree04c166d17bfae0456c664852563e039644251420
parent276c153f44734e78cae25deb9fc9e79a604c6219 (diff)
Multi-line comments should end in a blankline
-rw-r--r--nova/api/openstack/incubator/volumes/volume_attachments.py4
-rw-r--r--nova/image/fake.py4
-rw-r--r--nova/tests/integrated/api/client.py4
3 files changed, 9 insertions, 3 deletions
diff --git a/nova/api/openstack/incubator/volumes/volume_attachments.py b/nova/api/openstack/incubator/volumes/volume_attachments.py
index 1e260b34d..aec4ea8f3 100644
--- a/nova/api/openstack/incubator/volumes/volume_attachments.py
+++ b/nova/api/openstack/incubator/volumes/volume_attachments.py
@@ -65,7 +65,9 @@ class Controller(wsgi.Controller):
"""The volume attachment API controller for the Openstack API.
A child resource of the server. Note that we use the volume id
- as the ID of the attachment (though this is not guaranteed externally)"""
+ as the ID of the attachment (though this is not guaranteed externally)
+
+ """
_serialization_metadata = {
'application/xml': {
diff --git a/nova/image/fake.py b/nova/image/fake.py
index cdb650165..4caf68d63 100644
--- a/nova/image/fake.py
+++ b/nova/image/fake.py
@@ -56,7 +56,9 @@ class MockImageService(service.BaseImageService):
def show(self, context, image_id):
"""Get data about specified image.
- Returns a dict containing image data for the given opaque image id."""
+ Returns a dict containing image data for the given opaque image id.
+
+ """
image_id = int(image_id)
image = self.images.get(image_id)
if image:
diff --git a/nova/tests/integrated/api/client.py b/nova/tests/integrated/api/client.py
index b40ff58e3..7e20c9b00 100644
--- a/nova/tests/integrated/api/client.py
+++ b/nova/tests/integrated/api/client.py
@@ -59,7 +59,9 @@ class TestOpenStackClient(object):
"""Simple OpenStack API Client.
This is a really basic OpenStack API client that is under our control,
- so we can make changes / insert hooks for testing"""
+ so we can make changes / insert hooks for testing
+
+ """
def __init__(self, auth_user, auth_key, auth_uri):
super(TestOpenStackClient, self).__init__()