pep8

2 files changed, 20 insertions, 31 deletions

diff --git a/nova/adminclient.py b/nova/adminclient.py
index 3a2ce2f01..fceeac274 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -23,6 +23,7 @@ import base64
 import boto
 from boto.ec2.regioninfo import RegionInfo
 
+
 class UserInfo(object):
     """
     Information about a Nova user, as parsed through SAX
@@ -170,8 +171,7 @@ class NovaAdminClient(object):
             region=RegionInfo(None, self.region, self.clc_ip),
             port=8773,
             path='/services/Cloud',
-            **kwargs
-        )
+            **kwargs)
 
     def get_users(self):
         """ grabs the list of all users """
@@ -215,13 +215,10 @@ class NovaAdminClient(object):
         """
         Add or remove a role for a user and project.
         """
-        params = {
-            'User': user,
-            'Role': role,
-            'Project': project,
-            'Operation': operation
-
-        }
+        params = {'User': user,
+                  'Role': role,
+                  'Project': project,
+                  'Operation': operation}
         return self.apiconn.get_status('ModifyUserRole', params)
 
     def get_projects(self, user=None):
@@ -241,8 +238,8 @@ class NovaAdminClient(object):
         Returns a single project with the specified name.
         """
         project = self.apiconn.get_object('DescribeProject',
-                                        {'Name': name},
-                                        ProjectInfo)
+                                          {'Name': name},
+                                          ProjectInfo)
 
         if project.projectname != None:
             return project
@@ -252,12 +249,10 @@ class NovaAdminClient(object):
         """
         Creates a new project.
         """
-        params = {
-            'Name': projectname,
-            'ManagerUser': manager_user,
-            'Description': description,
-            'MemberUsers': member_users
-        }
+        params = {'Name': projectname,
+                  'ManagerUser': manager_user,
+                  'Description': description,
+                  'MemberUsers': member_users}
         return self.apiconn.get_object('RegisterProject', params, ProjectInfo)
 
     def delete_project(self, projectname):
@@ -292,11 +287,9 @@ class NovaAdminClient(object):
         """
         Adds or removes a user from a project.
         """
-        params = {
-            'User': user,
-            'Project': project,
-            'Operation': operation
-        }
+        params = {'User': user,
+                  'Project': project,
+                  'Operation': operation}
         return self.apiconn.get_status('ModifyProjectMember', params)
 
     def get_zip(self, username):
diff --git a/nova/endpoint/admin.py b/nova/endpoint/admin.py
index db1d319f9..c4b8c05ca 100644
--- a/nova/endpoint/admin.py
+++ b/nova/endpoint/admin.py
@@ -25,6 +25,7 @@ import base64
 from nova.auth import manager
 from nova.compute import model
 
+
 def user_dict(user, base64_file=None):
     """Convert the user object to a result dict"""
     if user:
@@ -32,8 +33,7 @@ def user_dict(user, base64_file=None):
             'username': user.id,
             'accesskey': user.access,
             'secretkey': user.secret,
-            'file': base64_file,
-        }
+            'file': base64_file}
     else:
         return {}
 
@@ -43,8 +43,7 @@ def project_dict(project):
         return {
             'projectname': project.id,
             'project_manager_id': project.project_manager_id,
-            'description': project.description,
-        }
+            'description': project.description}
     else:
         return {}
 
@@ -149,9 +148,7 @@ class AdminController(object):
                 name,
                 manager_user,
                 description=None,
-                member_users=None
-            )
-        )
+                member_users=None))
 
     @admin_only
     def deregister_project(self, context, name):
@@ -163,8 +160,7 @@ class AdminController(object):
     def describe_project_members(self, context, name, **kwargs):
         project = manager.AuthManager().get_project(name)
         result = {
-            'members': [{'member': m} for m in project.member_ids]
-        }
+            'members': [{'member': m} for m in project.member_ids]}
         return result
         
     @admin_only