From 56a2eb07b2f3445a72066253a97f29bd2e313271 Mon Sep 17 00:00:00 2001 From: Eric Day Date: Thu, 21 Oct 2010 17:15:21 -0700 Subject: [PATCH] PEP8 cleanup in nova/*, except for tests. There should be no functional changes here, just style changes to get violations down. --- nova/auth/dbdriver.py | 51 +++++++++++++++++++++------------------- nova/auth/fakeldap.py | 11 ++++----- nova/auth/ldapdriver.py | 12 ++++++---- nova/auth/manager.py | 2 +- nova/scheduler/simple.py | 1 + 5 files changed, 41 insertions(+), 36 deletions(-) diff --git a/nova/auth/dbdriver.py b/nova/auth/dbdriver.py index 648d6e82..a1584322 100644 --- a/nova/auth/dbdriver.py +++ b/nova/auth/dbdriver.py @@ -47,19 +47,23 @@ class DbDriver(object): def get_user(self, uid): """Retrieve user by id""" - return self._db_user_to_auth_user(db.user_get(context.get_admin_context(), uid)) + user = db.user_get(context.get_admin_context(), uid) + return self._db_user_to_auth_user(user) def get_user_from_access_key(self, access): """Retrieve user by access key""" - return self._db_user_to_auth_user(db.user_get_by_access_key(context.get_admin_context(), access)) + user = db.user_get_by_access_key(context.get_admin_context(), access) + return self._db_user_to_auth_user(user) def get_project(self, pid): """Retrieve project by id""" - return self._db_project_to_auth_projectuser(db.project_get(context.get_admin_context(), pid)) + project = db.project_get(context.get_admin_context(), pid) + return self._db_project_to_auth_projectuser(project) def get_users(self): """Retrieve list of users""" - return [self._db_user_to_auth_user(user) for user in db.user_get_all(context.get_admin_context())] + return [self._db_user_to_auth_user(user) + for user in db.user_get_all(context.get_admin_context())] def get_projects(self, uid=None): """Retrieve list of projects""" @@ -71,11 +75,10 @@ class DbDriver(object): def create_user(self, name, access_key, secret_key, is_admin): """Create a user""" - values = { 'id' : name, - 'access_key' : access_key, - 'secret_key' : secret_key, - 'is_admin' : is_admin - } + values = {'id': name, + 'access_key': access_key, + 'secret_key': secret_key, + 'is_admin': is_admin} try: user_ref = db.user_create(context.get_admin_context(), values) return self._db_user_to_auth_user(user_ref) @@ -83,18 +86,19 @@ class DbDriver(object): raise exception.Duplicate('User %s already exists' % name) def _db_user_to_auth_user(self, user_ref): - return { 'id' : user_ref['id'], - 'name' : user_ref['id'], - 'access' : user_ref['access_key'], - 'secret' : user_ref['secret_key'], - 'admin' : user_ref['is_admin'] } + return {'id': user_ref['id'], + 'name': user_ref['id'], + 'access': user_ref['access_key'], + 'secret': user_ref['secret_key'], + 'admin': user_ref['is_admin']} def _db_project_to_auth_projectuser(self, project_ref): - return { 'id' : project_ref['id'], - 'name' : project_ref['name'], - 'project_manager_id' : project_ref['project_manager'], - 'description' : project_ref['description'], - 'member_ids' : [member['id'] for member in project_ref['members']] } + member_ids = [member['id'] for member in project_ref['members']] + return {'id': project_ref['id'], + 'name': project_ref['name'], + 'project_manager_id': project_ref['project_manager'], + 'description': project_ref['description'], + 'member_ids': member_ids} def create_project(self, name, manager_uid, description=None, member_uids=None): @@ -121,10 +125,10 @@ class DbDriver(object): % member_uid) members.add(member) - values = { 'id' : name, - 'name' : name, - 'project_manager' : manager['id'], - 'description': description } + values = {'id': name, + 'name': name, + 'project_manager': manager['id'], + 'description': description} try: project = db.project_create(context.get_admin_context(), values) @@ -244,4 +248,3 @@ class DbDriver(object): if not project: raise exception.NotFound('Project "%s" not found' % project_id) return user, project - diff --git a/nova/auth/fakeldap.py b/nova/auth/fakeldap.py index 3e92c38f..cf3a84a5 100644 --- a/nova/auth/fakeldap.py +++ b/nova/auth/fakeldap.py @@ -35,6 +35,7 @@ flags.DEFINE_integer('redis_port', 6379, 'Port that redis is running on.') flags.DEFINE_integer('redis_db', 0, 'Multiple DB keeps tests away') + class Redis(object): def __init__(self): if hasattr(self.__class__, '_instance'): @@ -51,19 +52,19 @@ class Redis(object): SCOPE_BASE = 0 -SCOPE_ONELEVEL = 1 # not implemented +SCOPE_ONELEVEL = 1 # Not implemented SCOPE_SUBTREE = 2 MOD_ADD = 0 MOD_DELETE = 1 MOD_REPLACE = 2 -class NO_SUCH_OBJECT(Exception): # pylint: disable-msg=C0103 +class NO_SUCH_OBJECT(Exception): # pylint: disable-msg=C0103 """Duplicate exception class from real LDAP module.""" pass -class OBJECT_CLASS_VIOLATION(Exception): # pylint: disable-msg=C0103 +class OBJECT_CLASS_VIOLATION(Exception): # pylint: disable-msg=C0103 """Duplicate exception class from real LDAP module.""" pass @@ -251,8 +252,6 @@ class FakeLDAP(object): return objects @property - def __redis_prefix(self): # pylint: disable-msg=R0201 + def __redis_prefix(self): # pylint: disable-msg=R0201 """Get the prefix to use for all redis keys.""" return 'ldap:' - - diff --git a/nova/auth/ldapdriver.py b/nova/auth/ldapdriver.py index 640ea169..ceade1d6 100644 --- a/nova/auth/ldapdriver.py +++ b/nova/auth/ldapdriver.py @@ -294,24 +294,26 @@ class LdapDriver(object): def __find_dns(self, dn, query=None, scope=None): """Find dns by query""" - if scope is None: # one of the flags is 0!! + if scope is None: + # One of the flags is 0! scope = self.ldap.SCOPE_SUBTREE try: res = self.conn.search_s(dn, scope, query) except self.ldap.NO_SUCH_OBJECT: return [] - # just return the DNs + # Just return the DNs return [dn for dn, _attributes in res] def __find_objects(self, dn, query=None, scope=None): """Find objects by query""" - if scope is None: # one of the flags is 0!! + if scope is None: + # One of the flags is 0! scope = self.ldap.SCOPE_SUBTREE try: res = self.conn.search_s(dn, scope, query) except self.ldap.NO_SUCH_OBJECT: return [] - # just return the attributes + # Just return the attributes return [attributes for dn, attributes in res] def __find_role_dns(self, tree): @@ -480,6 +482,6 @@ class LdapDriver(object): class FakeLdapDriver(LdapDriver): """Fake Ldap Auth driver""" - def __init__(self): # pylint: disable-msg=W0231 + def __init__(self): # pylint: disable-msg=W0231 __import__('nova.auth.fakeldap') self.ldap = sys.modules['nova.auth.fakeldap'] diff --git a/nova/auth/manager.py b/nova/auth/manager.py index bf7ca8a9..001a9687 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -23,7 +23,7 @@ Nova authentication management import logging import os import shutil -import string # pylint: disable-msg=W0402 +import string # pylint: disable-msg=W0402 import tempfile import uuid import zipfile diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py index fdaff74d..7f509365 100644 --- a/nova/scheduler/simple.py +++ b/nova/scheduler/simple.py @@ -36,6 +36,7 @@ flags.DEFINE_integer("max_gigabytes", 10000, flags.DEFINE_integer("max_networks", 1000, "maximum number of networks to allow per host") + class SimpleScheduler(chance.ChanceScheduler): """Implements Naive Scheduler that tries to find least loaded host."""