Update docstrings and spacing.

3 files changed, 13 insertions, 19 deletions

diff --git a/nova/api/openstack/server_metadata.py b/nova/api/openstack/server_metadata.py
index 2a1249b10..618665082 100644
--- a/nova/api/openstack/server_metadata.py
+++ b/nova/api/openstack/server_metadata.py
@@ -86,9 +86,7 @@ class Controller(wsgi.Controller):
         self.compute_api.delete_instance_metadata(context, server_id, id)
 
     def _handle_quota_error(self, error):
-        """
-        Reraise quota errors as api-specific http exceptions
-        """
+        """Reraise quota errors as api-specific http exceptions"""
         if error.code == "MetadataLimitExceeded":
             raise exc.HTTPBadRequest(explanation=error.message)
         raise error
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 678900fd9..c4aa581be 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -101,11 +101,7 @@ class API(base.Base):
                 raise quota.QuotaError(code="OnsetFileContentLimitExceeded")
 
     def _check_metadata_properties_quota(self, context, metadata={}):
-        """
-        Enforce quota limits on metadata properties
-
-        Raises a QuotaError if any limit is exceeded
-        """
+        """Enforce quota limits on metadata properties"""
         num_metadata = len(metadata)
         quota_metadata = quota.allowed_metadata_items(context, num_metadata)
         if quota_metadata < num_metadata:
diff --git a/nova/tests/api/openstack/test_server_metadata.py b/nova/tests/api/openstack/test_server_metadata.py
index fc51370f6..862e14b7c 100644
--- a/nova/tests/api/openstack/test_server_metadata.py
+++ b/nova/tests/api/openstack/test_server_metadata.py
@@ -84,7 +84,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_index(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_get',
-                        return_server_metadata)
+                       return_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta')
         req.environ['api.version'] = '1.1'
         res = req.get_response(fakes.wsgi_app())
@@ -94,7 +94,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_index_no_data(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_get',
-                        return_empty_server_metadata)
+                       return_empty_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta')
         req.environ['api.version'] = '1.1'
         res = req.get_response(fakes.wsgi_app())
@@ -104,7 +104,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_show(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_get',
-                        return_server_metadata)
+                       return_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key5')
         req.environ['api.version'] = '1.1'
         res = req.get_response(fakes.wsgi_app())
@@ -114,7 +114,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_show_meta_not_found(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_get',
-                        return_empty_server_metadata)
+                       return_empty_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key6')
         req.environ['api.version'] = '1.1'
         res = req.get_response(fakes.wsgi_app())
@@ -123,7 +123,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_delete(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_delete',
-                        delete_server_metadata)
+                       delete_server_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key5')
         req.environ['api.version'] = '1.1'
         req.method = 'DELETE'
@@ -132,7 +132,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_create(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta')
         req.environ['api.version'] = '1.1'
         req.method = 'POST'
@@ -145,7 +145,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_update_item(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key1')
         req.environ['api.version'] = '1.1'
         req.method = 'PUT'
@@ -158,7 +158,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_update_item_too_many_keys(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/key1')
         req.environ['api.version'] = '1.1'
         req.method = 'PUT'
@@ -169,7 +169,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_update_item_body_uri_mismatch(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         req = webob.Request.blank('/v1.1/servers/1/meta/bad')
         req.environ['api.version'] = '1.1'
         req.method = 'PUT'
@@ -180,7 +180,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_too_many_metadata_items_on_create(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata)
+                       return_create_instance_metadata)
         data = {"metadata": {}}
         for num in range(FLAGS.quota_metadata_items + 1):
             data['metadata']['key%i' % num] = "blah"
@@ -195,7 +195,7 @@ class ServerMetaDataTest(unittest.TestCase):
 
     def test_to_many_metadata_items_on_update_item(self):
         self.stubs.Set(nova.db.api, 'instance_metadata_update_or_create',
-                        return_create_instance_metadata_max)
+                       return_create_instance_metadata_max)
         req = webob.Request.blank('/v1.1/servers/1/meta/key1')
         req.environ['api.version'] = '1.1'
         req.method = 'PUT'