Skip to content

Commit 6f36385

Browse files
qinchunhuastevemar
qinchunhua
authored and
stevemar
committed
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
1 parent 272d193 commit 6f36385

12 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎openstackclient/common/availability_zone.py‎

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ def _get_compute_availability_zones(self, parsed_args):
122122
compute_client = self.app.client_manager.compute
123123
try:
124124
data = compute_client.availability_zones.list()
125-
except nova_exceptions.Forbidden as e: # policy doesn't allow
125+
except nova_exceptions.Forbidden: # policy doesn't allow
126126
try:
127127
data = compute_client.availability_zones.list(detailed=False)
128128
except Exception:
129-
raise e
129+
raise
130130

131131
# Argh, the availability zones are not iterable...
132132
result = []

‎openstackclient/common/quota.py‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def get_compute_volume_quota(self, client, parsed_args):
231231
if type(e).__name__ == 'EndpointNotFound':
232232
return {}
233233
else:
234-
raise e
234+
raise
235235
return quota._info
236236

237237
def get_network_quota(self, parsed_args):

‎openstackclient/identity/v2_0/project.py‎

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ def take_action(self, parsed_args):
8686
enabled=enabled,
8787
**kwargs
8888
)
89-
except ks_exc.Conflict as e:
89+
except ks_exc.Conflict:
9090
if parsed_args.or_show:
9191
project = utils.find_resource(
9292
identity_client.tenants,
9393
parsed_args.name,
9494
)
9595
LOG.info(_('Returning existing project %s'), project.name)
9696
else:
97-
raise e
97+
raise
9898

9999
# TODO(stevemar): Remove the line below when we support multitenancy
100100
project._info.pop('parent_id', None)
@@ -242,7 +242,7 @@ def take_action(self, parsed_args):
242242
parsed_args.project,
243243
)
244244
info.update(project._info)
245-
except ks_exc.Forbidden as e:
245+
except ks_exc.Forbidden:
246246
auth_ref = self.app.client_manager.auth_ref
247247
if (
248248
parsed_args.project == auth_ref.project_id or
@@ -256,7 +256,7 @@ def take_action(self, parsed_args):
256256
'enabled': True,
257257
}
258258
else:
259-
raise e
259+
raise
260260

261261
# TODO(stevemar): Remove the line below when we support multitenancy
262262
info.pop('parent_id', None)

‎openstackclient/identity/v2_0/role.py‎

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ def take_action(self, parsed_args):
9393
identity_client = self.app.client_manager.identity
9494
try:
9595
role = identity_client.roles.create(parsed_args.role_name)
96-
except ks_exc.Conflict as e:
96+
except ks_exc.Conflict:
9797
if parsed_args.or_show:
9898
role = utils.find_resource(
9999
identity_client.roles,
100100
parsed_args.role_name,
101101
)
102102
LOG.info(_('Returning existing role %s'), role.name)
103103
else:
104-
raise e
104+
raise
105105

106106
info = {}
107107
info.update(role._info)

‎openstackclient/identity/v2_0/user.py‎

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ def take_action(self, parsed_args):
102102
tenant_id=project_id,
103103
enabled=enabled,
104104
)
105-
except ks_exc.Conflict as e:
105+
except ks_exc.Conflict:
106106
if parsed_args.or_show:
107107
user = utils.find_resource(
108108
identity_client.users,
109109
parsed_args.name,
110110
)
111111
LOG.info(_('Returning existing user %s'), user.name)
112112
else:
113-
raise e
113+
raise
114114

115115
# NOTE(dtroyer): The users.create() method wants 'tenant_id' but
116116
# the returned resource has 'tenantId'. Sigh.
@@ -349,7 +349,7 @@ def take_action(self, parsed_args):
349349
parsed_args.user,
350350
)
351351
info.update(user._info)
352-
except ks_exc.Forbidden as e:
352+
except ks_exc.Forbidden:
353353
auth_ref = self.app.client_manager.auth_ref
354354
if (
355355
parsed_args.user == auth_ref.user_id or
@@ -364,7 +364,7 @@ def take_action(self, parsed_args):
364364
'enabled': True,
365365
}
366366
else:
367-
raise e
367+
raise
368368

369369
if 'tenantId' in info:
370370
info.update(

‎openstackclient/identity/v3/domain.py‎

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ def take_action(self, parsed_args):
7676
description=parsed_args.description,
7777
enabled=enabled,
7878
)
79-
except ks_exc.Conflict as e:
79+
except ks_exc.Conflict:
8080
if parsed_args.or_show:
8181
domain = utils.find_resource(identity_client.domains,
8282
parsed_args.name)
8383
LOG.info(_('Returning existing domain %s'), domain.name)
8484
else:
85-
raise e
85+
raise
8686

8787
domain._info.pop('links')
8888
return zip(*sorted(six.iteritems(domain._info)))

‎openstackclient/identity/v3/group.py‎

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ def take_action(self, parsed_args):
160160
name=parsed_args.name,
161161
domain=domain,
162162
description=parsed_args.description)
163-
except ks_exc.Conflict as e:
163+
except ks_exc.Conflict:
164164
if parsed_args.or_show:
165165
group = utils.find_resource(identity_client.groups,
166166
parsed_args.name,
167167
domain_id=domain)
168168
LOG.info(_('Returning existing group %s'), group.name)
169169
else:
170-
raise e
170+
raise
171171

172172
group._info.pop('links')
173173
return zip(*sorted(six.iteritems(group._info)))

‎openstackclient/identity/v3/project.py‎

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ def take_action(self, parsed_args):
111111
enabled=enabled,
112112
**kwargs
113113
)
114-
except ks_exc.Conflict as e:
114+
except ks_exc.Conflict:
115115
if parsed_args.or_show:
116116
project = utils.find_resource(identity_client.projects,
117117
parsed_args.name,
118118
domain_id=domain)
119119
LOG.info(_('Returning existing project %s'), project.name)
120120
else:
121-
raise e
121+
raise
122122

123123
project._info.pop('links')
124124
return zip(*sorted(six.iteritems(project._info)))

‎openstackclient/identity/v3/role.py‎

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ def take_action(self, parsed_args):
165165

166166
try:
167167
role = identity_client.roles.create(name=parsed_args.name)
168-
except ks_exc.Conflict as e:
168+
except ks_exc.Conflict:
169169
if parsed_args.or_show:
170170
role = utils.find_resource(identity_client.roles,
171171
parsed_args.name)
172172
LOG.info(_('Returning existing role %s'), role.name)
173173
else:
174-
raise e
174+
raise
175175

176176
role._info.pop('links')
177177
return zip(*sorted(six.iteritems(role._info)))

‎openstackclient/identity/v3/user.py‎

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ def take_action(self, parsed_args):
121121
description=parsed_args.description,
122122
enabled=enabled
123123
)
124-
except ks_exc.Conflict as e:
124+
except ks_exc.Conflict:
125125
if parsed_args.or_show:
126126
user = utils.find_resource(identity_client.users,
127127
parsed_args.name,
128128
domain_id=domain_id)
129129
LOG.info(_('Returning existing user %s'), user.name)
130130
else:
131-
raise e
131+
raise
132132

133133
user._info.pop('links')
134134
return zip(*sorted(six.iteritems(user._info)))

0 commit comments

Comments
 (0)