diff options
author | armando-migliaccio <armamig@gmail.com> | 2014-09-12 12:43:12 -0700 |
---|---|---|
committer | armando-migliaccio <armamig@gmail.com> | 2014-09-15 10:14:58 -0700 |
commit | 19527c450412117bd9a21b6b07c50359a123d1e5 (patch) | |
tree | 6070ce5af8a37c3b40649bf30ce139f43b95db84 | |
parent | 3e9efcdd6f1b6884257a59aa18d6075aa5f503fc (diff) | |
download | python-neutronclient-19527c450412117bd9a21b6b07c50359a123d1e5.tar.gz |
Narrow down except clause
To avoid masking brainfarts like the ones that led to
bug report below.
Related-bug: #1368835
Change-Id: I028b779e580da7719925a8e127f48bbe1aec211e
-rw-r--r-- | neutronclient/neutron/v2_0/agent.py | 2 | ||||
-rw-r--r-- | neutronclient/neutron/v2_0/fw/firewallpolicy.py | 2 | ||||
-rw-r--r-- | neutronclient/neutron/v2_0/network.py | 2 | ||||
-rw-r--r-- | neutronclient/neutron/v2_0/port.py | 2 | ||||
-rw-r--r-- | neutronclient/neutron/v2_0/router.py | 2 | ||||
-rw-r--r-- | neutronclient/neutron/v2_0/subnet.py | 6 | ||||
-rw-r--r-- | neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/neutronclient/neutron/v2_0/agent.py b/neutronclient/neutron/v2_0/agent.py index 5b48873..e9e2688 100644 --- a/neutronclient/neutron/v2_0/agent.py +++ b/neutronclient/neutron/v2_0/agent.py @@ -20,7 +20,7 @@ from neutronclient.neutron import v2_0 as neutronV20 def _format_timestamp(component): try: return component['heartbeat_timestamp'].split(".", 2)[0] - except Exception: + except (TypeError, KeyError): return '' diff --git a/neutronclient/neutron/v2_0/fw/firewallpolicy.py b/neutronclient/neutron/v2_0/fw/firewallpolicy.py index 0571a88..f278fbf 100644 --- a/neutronclient/neutron/v2_0/fw/firewallpolicy.py +++ b/neutronclient/neutron/v2_0/fw/firewallpolicy.py @@ -30,7 +30,7 @@ def _format_firewall_rules(firewall_policy): output = '[' + ',\n '.join([rule for rule in firewall_policy['firewall_rules']]) + ']' return output - except Exception: + except (TypeError, KeyError): return '' diff --git a/neutronclient/neutron/v2_0/network.py b/neutronclient/neutron/v2_0/network.py index 05a8de7..aef3e4c 100644 --- a/neutronclient/neutron/v2_0/network.py +++ b/neutronclient/neutron/v2_0/network.py @@ -25,7 +25,7 @@ def _format_subnets(network): try: return '\n'.join([' '.join([s['id'], s.get('cidr', '')]) for s in network['subnets']]) - except Exception: + except (TypeError, KeyError): return '' diff --git a/neutronclient/neutron/v2_0/port.py b/neutronclient/neutron/v2_0/port.py index 2aad26b..3b628b5 100644 --- a/neutronclient/neutron/v2_0/port.py +++ b/neutronclient/neutron/v2_0/port.py @@ -26,7 +26,7 @@ from neutronclient.openstack.common import jsonutils def _format_fixed_ips(port): try: return '\n'.join([jsonutils.dumps(ip) for ip in port['fixed_ips']]) - except Exception: + except (TypeError, KeyError): return '' diff --git a/neutronclient/neutron/v2_0/router.py b/neutronclient/neutron/v2_0/router.py index 055e418..369703e 100644 --- a/neutronclient/neutron/v2_0/router.py +++ b/neutronclient/neutron/v2_0/router.py @@ -27,7 +27,7 @@ from neutronclient.openstack.common import jsonutils def _format_external_gateway_info(router): try: return jsonutils.dumps(router['external_gateway_info']) - except Exception: + except (TypeError, KeyError): return '' diff --git a/neutronclient/neutron/v2_0/subnet.py b/neutronclient/neutron/v2_0/subnet.py index ece1632..0ba633f 100644 --- a/neutronclient/neutron/v2_0/subnet.py +++ b/neutronclient/neutron/v2_0/subnet.py @@ -27,7 +27,7 @@ def _format_allocation_pools(subnet): try: return '\n'.join([jsonutils.dumps(pool) for pool in subnet['allocation_pools']]) - except Exception: + except (TypeError, KeyError): return '' @@ -35,7 +35,7 @@ def _format_dns_nameservers(subnet): try: return '\n'.join([jsonutils.dumps(server) for server in subnet['dns_nameservers']]) - except Exception: + except (TypeError, KeyError): return '' @@ -43,7 +43,7 @@ def _format_host_routes(subnet): try: return '\n'.join([jsonutils.dumps(route) for route in subnet['host_routes']]) - except Exception: + except (TypeError, KeyError): return '' diff --git a/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py b/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py index 05a7dbc..1164511 100644 --- a/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py +++ b/neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py @@ -28,7 +28,7 @@ def _format_peer_cidrs(ipsec_site_connection): try: return '\n'.join([jsonutils.dumps(cidrs) for cidrs in ipsec_site_connection['peer_cidrs']]) - except Exception: + except (TypeError, KeyError): return '' |