Merge "fix N401 errors, stop ignoring all N4* errors"

4 files changed, 12 insertions, 12 deletions

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index d40f25c4d..a764a99bf 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -201,7 +201,7 @@ def _format_mappings(properties, result):
 
 
 class CloudController(object):
-    """ CloudController provides the critical dispatch between
+    """CloudController provides the critical dispatch between
  inbound API calls through the endpoint and messages
  sent to the other nodes.
 """
diff --git a/nova/api/openstack/compute/contrib/flavorextraspecs.py b/nova/api/openstack/compute/contrib/flavorextraspecs.py
index 77af25c9f..1abb525ad 100644
--- a/nova/api/openstack/compute/contrib/flavorextraspecs.py
+++ b/nova/api/openstack/compute/contrib/flavorextraspecs.py
@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-""" The instance type extra specs extension"""
+"""The instance type extra specs extension"""
 
 from webob import exc
 
@@ -35,7 +35,7 @@ class ExtraSpecsTemplate(xmlutil.TemplateBuilder):
 
 
 class FlavorExtraSpecsController(object):
-    """ The flavor extra specs API controller for the OpenStack API """
+    """The flavor extra specs API controller for the OpenStack API """
 
     def _get_extra_specs(self, context, flavor_id):
         extra_specs = db.instance_type_extra_specs_get(context, flavor_id)
@@ -51,7 +51,7 @@ class FlavorExtraSpecsController(object):
 
     @wsgi.serializers(xml=ExtraSpecsTemplate)
     def index(self, req, flavor_id):
-        """ Returns the list of extra specs for a givenflavor """
+        """Returns the list of extra specs for a givenflavor """
         context = req.environ['nova.context']
         authorize(context)
         return self._get_extra_specs(context, flavor_id)
@@ -92,7 +92,7 @@ class FlavorExtraSpecsController(object):
 
     @wsgi.serializers(xml=ExtraSpecsTemplate)
     def show(self, req, flavor_id, id):
-        """ Return a single extra spec item """
+        """Return a single extra spec item """
         context = req.environ['nova.context']
         authorize(context)
         specs = self._get_extra_specs(context, flavor_id)
@@ -102,7 +102,7 @@ class FlavorExtraSpecsController(object):
             raise exc.HTTPNotFound()
 
     def delete(self, req, flavor_id, id):
-        """ Deletes an existing extra spec """
+        """Deletes an existing extra spec """
         context = req.environ['nova.context']
         authorize(context)
         db.instance_type_extra_specs_delete(context, flavor_id, id)
diff --git a/nova/api/openstack/compute/contrib/keypairs.py b/nova/api/openstack/compute/contrib/keypairs.py
index e5e1e37fd..9b3b39384 100644
--- a/nova/api/openstack/compute/contrib/keypairs.py
+++ b/nova/api/openstack/compute/contrib/keypairs.py
@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-""" Keypair management extension"""
+"""Keypair management extension"""
 
 import webob
 import webob.exc
@@ -49,7 +49,7 @@ class KeypairsTemplate(xmlutil.TemplateBuilder):
 
 class KeypairController(object):
 
-    """ Keypair API controller for the OpenStack API """
+    """Keypair API controller for the OpenStack API """
     def __init__(self):
         self.api = compute_api.KeypairAPI()
 
diff --git a/nova/api/openstack/compute/server_metadata.py b/nova/api/openstack/compute/server_metadata.py
index 4e5a3ee02..910d88c30 100644
--- a/nova/api/openstack/compute/server_metadata.py
+++ b/nova/api/openstack/compute/server_metadata.py
@@ -24,7 +24,7 @@ from nova import exception
 
 
 class Controller(object):
-    """ The server metadata API controller for the OpenStack API """
+    """The server metadata API controller for the OpenStack API """
 
     def __init__(self):
         self.compute_api = compute.API()
@@ -45,7 +45,7 @@ class Controller(object):
 
     @wsgi.serializers(xml=common.MetadataTemplate)
     def index(self, req, server_id):
-        """ Returns the list of metadata for a given instance """
+        """Returns the list of metadata for a given instance """
         context = req.environ['nova.context']
         return {'metadata': self._get_metadata(context, server_id)}
 
@@ -138,7 +138,7 @@ class Controller(object):
 
     @wsgi.serializers(xml=common.MetaItemTemplate)
     def show(self, req, server_id, id):
-        """ Return a single metadata item """
+        """Return a single metadata item """
         context = req.environ['nova.context']
         data = self._get_metadata(context, server_id)
 
@@ -150,7 +150,7 @@ class Controller(object):
 
     @wsgi.response(204)
     def delete(self, req, server_id, id):
-        """ Deletes an existing metadata """
+        """Deletes an existing metadata """
         context = req.environ['nova.context']
 
         metadata = self._get_metadata(context, server_id)