From 817690b03f2e498fb08eba3ca455719229f24640 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 3 Nov 2010 15:06:00 -0700
Subject: pep8 whitespace and line length fixes

---
 nova/adminclient.py          | 4 ++--
 nova/compute/manager.py      | 3 ++-
 nova/db/api.py               | 4 ++--
 nova/db/sqlalchemy/models.py | 4 ++--
 nova/volume/driver.py        | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/nova/adminclient.py b/nova/adminclient.py
index 0227cddd7..af55197fc 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -273,10 +273,10 @@ class NovaAdminClient(object):
 
     def get_user_roles(self, user, project=None):
         """Returns a list of roles for the given user.
-        
+
         Omitting project will return any global roles that the user has.
         Specifying project will return only project specific roles.
-        
+
         """
         params = {'User': user}
         if project:
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 3aed1e5a5..890d79fba 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -22,7 +22,8 @@ Handles all processes relating to instances (guest vms).
 The :py:class:`ComputeManager` class is a :py:class:`nova.manager.Manager` that
 handles RPC calls relating to creating instances.  It is responsible for
 building a disk image, launching it via the underlying virtualization driver,
-responding to calls to check it state, attaching persistent as well as termination.
+responding to calls to check it state, attaching persistent as well as
+termination.
 
 **Related Flags**
 
diff --git a/nova/db/api.py b/nova/db/api.py
index 6f1043d8f..8f9dc2443 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -395,7 +395,7 @@ def network_create_safe(context, values):
 
     The network is only returned if the create succeeds. If the create violates
     constraints because the network already exists, no exception is raised.
-    
+
     """
     return IMPL.network_create_safe(context, values)
 
@@ -499,7 +499,7 @@ def export_device_create_safe(context, values):
     The device is not returned. If the create violates the unique
     constraints because the shelf_id and blade_id already exist,
     no exception is raised.
-    
+
     """
     return IMPL.export_device_create_safe(context, values)
 
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index bc9a7480e..01b5cf350 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -411,10 +411,10 @@ class Network(BASE, NovaBase):
 
 class AuthToken(BASE, NovaBase):
     """Represents an authorization token for all API transactions.
-    
+
     Fields are a string representing the actual token and a user id for
     mapping to the actual user
-    
+
     """
     __tablename__ = 'auth_tokens'
     token_hash = Column(String(255), primary_key=True)
diff --git a/nova/volume/driver.py b/nova/volume/driver.py
index 89e5c8d57..156aad2a0 100644
--- a/nova/volume/driver.py
+++ b/nova/volume/driver.py
@@ -114,7 +114,7 @@ class VolumeDriver(object):
                                                  escaped_name))
 
     def ensure_export(self, context, volume):
-        """Safely and synchronously recreates an export for a logical volume."""
+        """Synchronously recreates an export for a logical volume."""
         raise NotImplementedError()
 
     @defer.inlineCallbacks
@@ -228,7 +228,7 @@ class ISCSIDriver(VolumeDriver):
     """Executes commands relating to ISCSI volumes."""
 
     def ensure_export(self, context, volume):
-        """Safely and synchronously recreates an export for a logical volume."""
+        """Synchronously recreates an export for a logical volume."""
         iscsi_target = self.db.volume_get_iscsi_target_num(context,
                                                            volume['id'])
         iscsi_name = "%s%s" % (FLAGS.iscsi_target_prefix, volume['name'])
-- 
cgit