openstack/keystone
Code Issues Proposed changes

PEP8 fixes

Browse Source 
Change-Id: I957311f7e2f371217d8812c7319b87623e8972e9
This commit is contained in:
Dolph Mathews 2012-06-01 10:03:34 -05:00 committed by Joe Heck
parent 1349e12735
commit 4bfa203ac4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/common/kvs.py
View File

@ -17,7 +17,7 @@
class DictKvs(dict): class DictKvs(dict):
def set(self, key, value): def set(self, key, value):
if type(value) is type({}): if isinstance(value, dict):
self[key] = value.copy() self[key] = value.copy()
else: else:
self[key] = value[:] self[key] = value[:]
@ -33,6 +33,6 @@ class Base(object):
def __init__(self, db=None): def __init__(self, db=None):
if db is None: if db is None:
db = INMEMDB db = INMEMDB
elif type(db) is type({}): elif isinstance(db, dict):
db = DictKvs(db) db = DictKvs(db)
self.db = db self.db = db

2
keystone/common/ldap/core.py
View File

@ -79,7 +79,7 @@ class BaseLdap(object):
if self.options_name is not None: if self.options_name is not None:
self.suffix = conf.ldap.suffix self.suffix = conf.ldap.suffix
if (self.suffix == None): if self.suffix is None:
self.suffix = self.DEFAULT_SUFFIX self.suffix = self.DEFAULT_SUFFIX
dn = '%s_tree_dn' % self.options_name dn = '%s_tree_dn' % self.options_name
self.tree_dn = (getattr(conf.ldap, dn) self.tree_dn = (getattr(conf.ldap, dn)

2
keystone/identity/core.py
View File

@ -420,7 +420,7 @@ class UserController(wsgi.Application):
user_ref = self.identity_api.update_user(context, user_id, user) user_ref = self.identity_api.update_user(context, user_id, user)
# If the password was changed or the user was disabled we clear tokens # If the password was changed or the user was disabled we clear tokens
if user.get('password') or user.get('enabled', True) == False: if user.get('password') or not user.get('enabled', True):
try: try:
for token_id in self.token_api.list_tokens(context, user_id): for token_id in self.token_api.list_tokens(context, user_id):
self.token_api.delete_token(context, token_id) self.token_api.delete_token(context, token_id)

2
keystone/openstack/common/setup.py
View File

@ -31,7 +31,7 @@ def parse_mailmap(mailmap='.mailmap'):
for l in fp: for l in fp:
l = l.strip() l = l.strip()
if not l.startswith('#') and ' ' in l: if not l.startswith('#') and ' ' in l:
canonical_email, alias = [x for x in l.split(' ') \ canonical_email, alias = [x for x in l.split(' ')
if x.startswith('<')] if x.startswith('<')]
mapping[alias] = canonical_email mapping[alias] = canonical_email
return mapping return mapping