diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-07 20:56:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-07 20:56:18 +0000 |
| commit | ffb232a90e8b5c8358e017bf057a045a2d59bbfc (patch) | |
| tree | 4900840df82bb3151d997aee85610df0ecc4ac4a /openstackclient/common | |
| parent | 2adeac2bc2421a96273dfbc2b39a43cc06e542e6 (diff) | |
| parent | 6f36385cb87d04577d60032f6e74c732edab6d45 (diff) | |
| download | python-openstackclient-ffb232a90e8b5c8358e017bf057a045a2d59bbfc.tar.gz | |
Merge "Correct reraising of exception"
Diffstat (limited to 'openstackclient/common')
| -rwxr-xr-x[-rw-r--r--] | openstackclient/common/availability_zone.py | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | openstackclient/common/quota.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/common/availability_zone.py b/openstackclient/common/availability_zone.py index 89d77d15..63c55370 100644..100755 --- 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 index 69415f0d..3c12c366 100644..100755 --- 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): |