From 6f36385cb87d04577d60032f6e74c732edab6d45 Mon Sep 17 00:00:00 2001 From: qinchunhua Date: Thu, 7 Jul 2016 07:42:01 -0400 Subject: [PATCH] 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 --- openstackclient/common/availability_zone.py | 4 ++-- openstackclient/common/quota.py | 2 +- openstackclient/identity/v2_0/project.py | 8 ++++---- openstackclient/identity/v2_0/role.py | 4 ++-- openstackclient/identity/v2_0/user.py | 8 ++++---- openstackclient/identity/v3/domain.py | 4 ++-- openstackclient/identity/v3/group.py | 4 ++-- openstackclient/identity/v3/project.py | 4 ++-- openstackclient/identity/v3/role.py | 4 ++-- openstackclient/identity/v3/user.py | 4 ++-- openstackclient/image/v2/image.py | 8 ++++---- openstackclient/shell.py | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) mode change 100644 => 100755 openstackclient/common/availability_zone.py mode change 100644 => 100755 openstackclient/common/quota.py mode change 100644 => 100755 openstackclient/identity/v2_0/project.py mode change 100644 => 100755 openstackclient/identity/v2_0/role.py mode change 100644 => 100755 openstackclient/identity/v2_0/user.py mode change 100644 => 100755 openstackclient/identity/v3/domain.py mode change 100644 => 100755 openstackclient/identity/v3/group.py mode change 100644 => 100755 openstackclient/identity/v3/project.py mode change 100644 => 100755 openstackclient/identity/v3/role.py mode change 100644 => 100755 openstackclient/identity/v3/user.py mode change 100644 => 100755 openstackclient/image/v2/image.py mode change 100644 => 100755 openstackclient/shell.py diff --git a/openstackclient/common/availability_zone.py b/openstackclient/common/availability_zone.py old mode 100644 new mode 100755 index 89d77d1585..63c55370b0 --- a/openstackclient/common/availability_zone.py +++ b/openstackclient/common/availability_zone.py @@ -122,11 +122,11 @@ class ListAvailabilityZone(command.Lister): compute_client = self.app.client_manager.compute try: data = compute_client.availability_zones.list() - except nova_exceptions.Forbidden as e: # policy doesn't allow + except nova_exceptions.Forbidden: # policy doesn't allow try: data = compute_client.availability_zones.list(detailed=False) except Exception: - raise e + raise # Argh, the availability zones are not iterable... result = [] diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py old mode 100644 new mode 100755 index 69415f0dc0..3c12c3665d --- a/openstackclient/common/quota.py +++ b/openstackclient/common/quota.py @@ -231,7 +231,7 @@ class ShowQuota(command.ShowOne): if type(e).__name__ == 'EndpointNotFound': return {} else: - raise e + raise return quota._info def get_network_quota(self, parsed_args): diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py old mode 100644 new mode 100755 index 6c5db13c68..fc5c920175 --- a/openstackclient/identity/v2_0/project.py +++ b/openstackclient/identity/v2_0/project.py @@ -86,7 +86,7 @@ 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.tenants, @@ -94,7 +94,7 @@ class CreateProject(command.ShowOne): ) LOG.info(_('Returning existing project %s'), project.name) else: - raise e + raise # TODO(stevemar): Remove the line below when we support multitenancy project._info.pop('parent_id', None) @@ -242,7 +242,7 @@ class ShowProject(command.ShowOne): parsed_args.project, ) info.update(project._info) - except ks_exc.Forbidden as e: + except ks_exc.Forbidden: auth_ref = self.app.client_manager.auth_ref if ( parsed_args.project == auth_ref.project_id or @@ -256,7 +256,7 @@ class ShowProject(command.ShowOne): 'enabled': True, } else: - raise e + raise # TODO(stevemar): Remove the line below when we support multitenancy info.pop('parent_id', None) diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py old mode 100644 new mode 100755 index 6d06230c44..191cdaa3d1 --- a/openstackclient/identity/v2_0/role.py +++ b/openstackclient/identity/v2_0/role.py @@ -93,7 +93,7 @@ class CreateRole(command.ShowOne): identity_client = self.app.client_manager.identity try: role = identity_client.roles.create(parsed_args.role_name) - except ks_exc.Conflict as e: + except ks_exc.Conflict: if parsed_args.or_show: role = utils.find_resource( identity_client.roles, @@ -101,7 +101,7 @@ class CreateRole(command.ShowOne): ) LOG.info(_('Returning existing role %s'), role.name) else: - raise e + raise info = {} info.update(role._info) diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py old mode 100644 new mode 100755 index 0f3278309c..d2075150d2 --- 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( diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py old mode 100644 new mode 100755 index 8ba76c41b5..0546ac5217 --- 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 old mode 100644 new mode 100755 index 8351fe640f..c79a64e782 --- 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 old mode 100644 new mode 100755 index 56c1d41ada..5398701704 --- 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 old mode 100644 new mode 100755 index 965ca3f59f..d3c530a502 --- 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 old mode 100644 new mode 100755 index dd5af06a31..3e189ac1c6 --- 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))) diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py old mode 100644 new mode 100755 index 309b1b6b18..64092fea74 --- a/openstackclient/image/v2/image.py +++ b/openstackclient/image/v2/image.py @@ -339,7 +339,7 @@ class CreateImage(command.ShowOne): with fp: try: image_client.images.upload(image.id, fp) - except Exception as e: + except Exception: # If the upload fails for some reason attempt to remove the # dangling queued image made by the create() call above but # only if the user did not specify an id which indicates @@ -349,7 +349,7 @@ class CreateImage(command.ShowOne): image_client.images.delete(image.id) except Exception: pass # we don't care about this one - raise e # now, throw the upload exception again + raise # now, throw the upload exception again # update the image after the data has been uploaded image = image_client.images.get(image.id) @@ -834,11 +834,11 @@ class SetImage(command.Command): try: image = image_client.images.update(image.id, **kwargs) - except Exception as e: + except Exception: if activation_status is not None: LOG.info(_("Image %(id)s was %(status)s."), {'id': image.id, 'status': activation_status}) - raise e + raise class ShowImage(command.ShowOne): diff --git a/openstackclient/shell.py b/openstackclient/shell.py old mode 100644 new mode 100755 index 49a0604081..ed729e537c --- a/openstackclient/shell.py +++ b/openstackclient/shell.py @@ -331,10 +331,10 @@ class OpenStackShell(app.App): 'auth_type': auth_type, }, ) - except (IOError, OSError) as e: + except (IOError, OSError): self.log.critical("Could not read clouds.yaml configuration file") self.print_help_if_requested() - raise e + raise # TODO(thowe): Change cliff so the default value for debug # can be set to None.