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

5 files changed, 10 insertions, 10 deletions

diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index 8ba76c41..0546ac52 100644..100755
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.py
@@ -76,13 +76,13 @@ class CreateDomain(command.ShowOne):
                 description=parsed_args.description,
                 enabled=enabled,
             )
-        except ks_exc.Conflict as e:
+        except ks_exc.Conflict:
             if parsed_args.or_show:
                 domain = utils.find_resource(identity_client.domains,
                                              parsed_args.name)
                 LOG.info(_('Returning existing domain %s'), domain.name)
             else:
-                raise e
+                raise
 
         domain._info.pop('links')
         return zip(*sorted(six.iteritems(domain._info)))
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index 8351fe64..c79a64e7 100644..100755
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -160,14 +160,14 @@ class CreateGroup(command.ShowOne):
                 name=parsed_args.name,
                 domain=domain,
                 description=parsed_args.description)
-        except ks_exc.Conflict as e:
+        except ks_exc.Conflict:
             if parsed_args.or_show:
                 group = utils.find_resource(identity_client.groups,
                                             parsed_args.name,
                                             domain_id=domain)
                 LOG.info(_('Returning existing group %s'), group.name)
             else:
-                raise e
+                raise
 
         group._info.pop('links')
         return zip(*sorted(six.iteritems(group._info)))
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index 56c1d41a..53987017 100644..100755
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -111,14 +111,14 @@ class CreateProject(command.ShowOne):
                 enabled=enabled,
                 **kwargs
             )
-        except ks_exc.Conflict as e:
+        except ks_exc.Conflict:
             if parsed_args.or_show:
                 project = utils.find_resource(identity_client.projects,
                                               parsed_args.name,
                                               domain_id=domain)
                 LOG.info(_('Returning existing project %s'), project.name)
             else:
-                raise e
+                raise
 
         project._info.pop('links')
         return zip(*sorted(six.iteritems(project._info)))
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 965ca3f5..d3c530a5 100644..100755
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -165,13 +165,13 @@ class CreateRole(command.ShowOne):
 
         try:
             role = identity_client.roles.create(name=parsed_args.name)
-        except ks_exc.Conflict as e:
+        except ks_exc.Conflict:
             if parsed_args.or_show:
                 role = utils.find_resource(identity_client.roles,
                                            parsed_args.name)
                 LOG.info(_('Returning existing role %s'), role.name)
             else:
-                raise e
+                raise
 
         role._info.pop('links')
         return zip(*sorted(six.iteritems(role._info)))
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index dd5af06a..3e189ac1 100644..100755
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -121,14 +121,14 @@ class CreateUser(command.ShowOne):
                 description=parsed_args.description,
                 enabled=enabled
             )
-        except ks_exc.Conflict as e:
+        except ks_exc.Conflict:
             if parsed_args.or_show:
                 user = utils.find_resource(identity_client.users,
                                            parsed_args.name,
                                            domain_id=domain_id)
                 LOG.info(_('Returning existing user %s'), user.name)
             else:
-                raise e
+                raise
 
         user._info.pop('links')
         return zip(*sorted(six.iteritems(user._info)))