summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2011-04-20 12:26:17 -0700
committertermie <github@anarkystic.com>2011-04-20 12:26:17 -0700
commitce8fd6b5e3ef0c757c76bbe9db37c696a1d2c11c (patch)
tree64320c0d8f889432fcd736de4535ad4ea2c1b2ff
parent42b139f740c08cce04d898c4ce7c85030733927f (diff)
downloadnova-ce8fd6b5e3ef0c757c76bbe9db37c696a1d2c11c.tar.gz
nova-ce8fd6b5e3ef0c757c76bbe9db37c696a1d2c11c.tar.xz
nova-ce8fd6b5e3ef0c757c76bbe9db37c696a1d2c11c.zip
more changes per review
-rw-r--r--nova/image/local.py5
-rw-r--r--nova/image/service.py10
2 files changed, 7 insertions, 8 deletions
diff --git a/nova/image/local.py b/nova/image/local.py
index d59c3970f..50f00bee1 100644
--- a/nova/image/local.py
+++ b/nova/image/local.py
@@ -57,9 +57,8 @@ class LocalImageService(service.BaseImageService):
try:
unhexed_image_id = int(image_dir, 16)
except ValueError:
- LOG.error(
- _('%s is not in correct directory naming format'\
- % image_dir))
+ LOG.error(_('%s is not in correct directory naming format')
+ % image_dir)
else:
images.append(unhexed_image_id)
return images
diff --git a/nova/image/service.py b/nova/image/service.py
index 3e2357df8..ab6749049 100644
--- a/nova/image/service.py
+++ b/nova/image/service.py
@@ -49,8 +49,8 @@ class BaseImageService(object):
def index(self, context):
"""List images.
- :returnsl: a sequence of mappings with the following signature
- {'id': opaque id of image, 'name': name of image}
+ :returns: a sequence of mappings with the following signature
+ {'id': opaque id of image, 'name': name of image}
"""
raise NotImplementedError
@@ -102,7 +102,7 @@ class BaseImageService(object):
:param data: a file-like object to hold binary image data
:returns: a dict containing image metadata, writes image data to data.
- :raises NotFound if the image does not exist
+ :raises: NotFound if the image does not exist
"""
raise NotImplementedError
@@ -119,7 +119,7 @@ class BaseImageService(object):
def update(self, context, image_id, metadata, data=None):
"""Update the given image metadata and data and return the metadata.
- :raises NotFound if the image does not exist.
+ :raises: NotFound if the image does not exist.
"""
raise NotImplementedError
@@ -127,7 +127,7 @@ class BaseImageService(object):
def delete(self, context, image_id):
"""Delete the given image.
- :raises NotFound if the image does not exist.
+ :raises: NotFound if the image does not exist.
"""
raise NotImplementedError