From 47bdec25eb51d2dfbcd28af512cfbd4f4165b332 Mon Sep 17 00:00:00 2001
From: Dolph Mathews <dolph.mathews@gmail.com>
Date: Thu, 23 May 2013 14:58:01 -0500
Subject: eliminate 'except:' (flake8 H201)

Change-Id: Ic53b43b96c490557352be212ac79a7e8a249c21a
---
 keystone/common/utils.py                | 2 +-
 keystone/identity/backends/ldap/core.py | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'keystone')

diff --git a/keystone/common/utils.py b/keystone/common/utils.py
index 9536cdc7..e35bde01 100644
--- a/keystone/common/utils.py
+++ b/keystone/common/utils.py
@@ -228,7 +228,7 @@ def setup_remote_pydev_debug():
                             stdoutToServer=True,
                             stderrToServer=True)
             return True
-        except:
+        except Exception:
             LOG.exception(_(
                 'Error setting up the debug environment. Verify that the '
                 'option --debug-url has the format <host>:<port> and that a '
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py
index 87e560e0..f5cdc69a 100644
--- a/keystone/identity/backends/ldap/core.py
+++ b/keystone/identity/backends/ldap/core.py
@@ -855,10 +855,7 @@ class RoleApi(common_ldap.BaseLdap, ApiShimMixin):
                 roles = conn.search_s(dn, ldap.SCOPE_ONELEVEL,
                                       query, ['%s' % '1.1'])
                 for role_dn, _ in roles:
-                    try:
-                        conn.delete_s(role_dn)
-                    except:
-                        raise Exception
+                    conn.delete_s(role_dn)
             except ldap.NO_SUCH_OBJECT:
                 pass
 
-- 
cgit