From 4bfa203ac433da1537d8da963bd7554d36f2add7 Mon Sep 17 00:00:00 2001
From: Dolph Mathews <dolph.mathews@gmail.com>
Date: Fri, 1 Jun 2012 10:03:34 -0500
Subject: PEP8 fixes

Change-Id: I957311f7e2f371217d8812c7319b87623e8972e9
---
 keystone/common/kvs.py             | 4 ++--
 keystone/common/ldap/core.py       | 2 +-
 keystone/identity/core.py          | 2 +-
 keystone/openstack/common/setup.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/keystone/common/kvs.py b/keystone/common/kvs.py
index 3f4ded15..5f5d6015 100644
--- a/keystone/common/kvs.py
+++ b/keystone/common/kvs.py
@@ -17,7 +17,7 @@
 
 class DictKvs(dict):
     def set(self, key, value):
-        if type(value) is type({}):
+        if isinstance(value, dict):
             self[key] = value.copy()
         else:
             self[key] = value[:]
@@ -33,6 +33,6 @@ class Base(object):
     def __init__(self, db=None):
         if db is None:
             db = INMEMDB
-        elif type(db) is type({}):
+        elif isinstance(db, dict):
             db = DictKvs(db)
         self.db = db
diff --git a/keystone/common/ldap/core.py b/keystone/common/ldap/core.py
index 72647c27..695db700 100644
--- a/keystone/common/ldap/core.py
+++ b/keystone/common/ldap/core.py
@@ -79,7 +79,7 @@ class BaseLdap(object):
 
         if self.options_name is not None:
             self.suffix = conf.ldap.suffix
-            if (self.suffix == None):
+            if self.suffix is None:
                 self.suffix = self.DEFAULT_SUFFIX
             dn = '%s_tree_dn' % self.options_name
             self.tree_dn = (getattr(conf.ldap, dn)
diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index 2857f66b..57654b85 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -420,7 +420,7 @@ class UserController(wsgi.Application):
         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 user.get('password') or user.get('enabled', True) == False:
+        if user.get('password') or not user.get('enabled', True):
             try:
                 for token_id in self.token_api.list_tokens(context, user_id):
                     self.token_api.delete_token(context, token_id)
diff --git a/keystone/openstack/common/setup.py b/keystone/openstack/common/setup.py
index 984cce1f..c219152a 100644
--- a/keystone/openstack/common/setup.py
+++ b/keystone/openstack/common/setup.py
@@ -31,7 +31,7 @@ def parse_mailmap(mailmap='.mailmap'):
         for l in fp:
             l = l.strip()
             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('<')]
                 mapping[alias] = canonical_email
     return mapping
-- 
cgit