summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v2_0/user.py
diff options
context:
space:
mode:
authorqinchunhua <qin.chunhua@zte.com.cn>2016-07-07 07:42:01 -0400
committerSteve Martinelli <s.martinelli@gmail.com>2016-07-07 15:05:58 +0000
commit6f36385cb87d04577d60032f6e74c732edab6d45 (patch)
tree86e2d4b3dbe578529fc6884aea0761146a78493f /openstackclient/identity/v2_0/user.py
parent272d19340117927f6988c61113abc3dd995af76d (diff)
downloadpython-openstackclient-6f36385cb87d04577d60032f6e74c732edab6d45.tar.gz
Correct reraising of exception
When an exception was caught and rethrown, it should call 'raise' without any arguments because it shows the place where an exception occured initially instead of place where the exception re-raised. Change-Id: I5fb6dea5da7fb6e1e2b339a713c7d37f8c99e407
Diffstat (limited to 'openstackclient/identity/v2_0/user.py')
-rwxr-xr-x[-rw-r--r--]openstackclient/identity/v2_0/user.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 0f327830..d2075150 100644..100755
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -102,7 +102,7 @@ class CreateUser(command.ShowOne):
tenant_id=project_id,
enabled=enabled,
)
- except ks_exc.Conflict as e:
+ except ks_exc.Conflict:
if parsed_args.or_show:
user = utils.find_resource(
identity_client.users,
@@ -110,7 +110,7 @@ class CreateUser(command.ShowOne):
)
LOG.info(_('Returning existing user %s'), user.name)
else:
- raise e
+ raise
# NOTE(dtroyer): The users.create() method wants 'tenant_id' but
# the returned resource has 'tenantId'. Sigh.
@@ -349,7 +349,7 @@ class ShowUser(command.ShowOne):
parsed_args.user,
)
info.update(user._info)
- except ks_exc.Forbidden as e:
+ except ks_exc.Forbidden:
auth_ref = self.app.client_manager.auth_ref
if (
parsed_args.user == auth_ref.user_id or
@@ -364,7 +364,7 @@ class ShowUser(command.ShowOne):
'enabled': True,
}
else:
- raise e
+ raise
if 'tenantId' in info:
info.update(