summaryrefslogtreecommitdiff
path: root/openstack_dashboard/dashboards/project/routers
diff options
context:
space:
mode:
authorKieran Spear <kispear@gmail.com>2013-08-13 16:54:59 +1000
committerKieran Spear <kispear@gmail.com>2013-08-13 17:21:32 +1000
commit242c8df495d8a22bd58797691989852d1b714824 (patch)
tree519d761d1989ca1aca0f98f9dd0cccfaa9f99874 /openstack_dashboard/dashboards/project/routers
parentfe659b231a9542e4703c13e7e1173aa7e0767cfc (diff)
downloadhorizon-242c8df495d8a22bd58797691989852d1b714824.tar.gz
Enable H201: do not write "except:"
Fixes all occurrences of this. We have a custom exception handler in Horizon anyway that only catches ClientException in most of these cases, but this commit lets us gate on the other cases. Change-Id: Iea3dc13817f3e5b775b2024424bf3a906da5584b Closes-Bug: #1211657
Diffstat (limited to 'openstack_dashboard/dashboards/project/routers')
-rw-r--r--openstack_dashboard/dashboards/project/routers/forms.py2
-rw-r--r--openstack_dashboard/dashboards/project/routers/ports/forms.py6
-rw-r--r--openstack_dashboard/dashboards/project/routers/ports/tables.py2
-rw-r--r--openstack_dashboard/dashboards/project/routers/ports/tabs.py2
-rw-r--r--openstack_dashboard/dashboards/project/routers/ports/views.py4
-rw-r--r--openstack_dashboard/dashboards/project/routers/tabs.py2
-rw-r--r--openstack_dashboard/dashboards/project/routers/views.py6
7 files changed, 12 insertions, 12 deletions
diff --git a/openstack_dashboard/dashboards/project/routers/forms.py b/openstack_dashboard/dashboards/project/routers/forms.py
index 77e53a0c0..36830017e 100644
--- a/openstack_dashboard/dashboards/project/routers/forms.py
+++ b/openstack_dashboard/dashboards/project/routers/forms.py
@@ -33,7 +33,7 @@ class CreateForm(forms.SelfHandlingForm):
message = _('Router %s was successfully created.') % data['name']
messages.success(request, message)
return router
- except:
+ except Exception:
msg = _('Failed to create router "%s".') % data['name']
LOG.info(msg)
redirect = reverse(self.failure_url)
diff --git a/openstack_dashboard/dashboards/project/routers/ports/forms.py b/openstack_dashboard/dashboards/project/routers/ports/forms.py
index 513027035..545dbba1f 100644
--- a/openstack_dashboard/dashboards/project/routers/ports/forms.py
+++ b/openstack_dashboard/dashboards/project/routers/ports/forms.py
@@ -96,7 +96,7 @@ class AddInterface(forms.SelfHandlingForm):
self._handle_error(request, router_id, e)
try:
port = api.neutron.port_get(request, router_inf['port_id'])
- except:
+ except Exception:
# Ignore an error when port_get() since it is just
# to get an IP address for the interface.
port = None
@@ -107,7 +107,7 @@ class AddInterface(forms.SelfHandlingForm):
subnet_id = data['subnet_id']
try:
subnet = api.neutron.subnet_get(request, subnet_id)
- except:
+ except Exception:
msg = _('Unable to get subnet "%s"') % subnet_id
self._handle_error(request, router_id, msg)
try:
@@ -135,7 +135,7 @@ class AddInterface(forms.SelfHandlingForm):
def _delete_port(self, request, port):
try:
api.neutron.port_delete(request, port.id)
- except:
+ except Exception:
msg = _('Failed to delete port %s') % port.id
LOG.info(msg)
exceptions.handle(request, msg)
diff --git a/openstack_dashboard/dashboards/project/routers/ports/tables.py b/openstack_dashboard/dashboards/project/routers/ports/tables.py
index 01576373c..0b8d9df12 100644
--- a/openstack_dashboard/dashboards/project/routers/ports/tables.py
+++ b/openstack_dashboard/dashboards/project/routers/ports/tables.py
@@ -63,7 +63,7 @@ class RemoveInterface(tables.DeleteAction):
api.neutron.router_remove_interface(request,
router_id,
port_id=obj_id)
- except:
+ except Exception:
msg = _('Failed to delete interface %s') % obj_id
LOG.info(msg)
router_id = self.table.kwargs['router_id']
diff --git a/openstack_dashboard/dashboards/project/routers/ports/tabs.py b/openstack_dashboard/dashboards/project/routers/ports/tabs.py
index 476ab5d2f..f3ef2c908 100644
--- a/openstack_dashboard/dashboards/project/routers/ports/tabs.py
+++ b/openstack_dashboard/dashboards/project/routers/ports/tabs.py
@@ -35,7 +35,7 @@ class OverviewTab(tabs.Tab):
port_id = self.tab_group.kwargs['port_id']
try:
port = api.neutron.port_get(self.request, port_id)
- except:
+ except Exception:
redirect = reverse(self.failure_url)
msg = _('Unable to retrieve port details.')
exceptions.handle(request, msg, redirect=redirect)
diff --git a/openstack_dashboard/dashboards/project/routers/ports/views.py b/openstack_dashboard/dashboards/project/routers/ports/views.py
index ea08080f7..d64b43e4a 100644
--- a/openstack_dashboard/dashboards/project/routers/ports/views.py
+++ b/openstack_dashboard/dashboards/project/routers/ports/views.py
@@ -51,7 +51,7 @@ class AddInterfaceView(forms.ModalFormView):
router_id = self.kwargs["router_id"]
self._object = api.neutron.router_get(self.request,
router_id)
- except:
+ except Exception:
redirect = reverse(self.failure_url, args=[router_id])
msg = _("Unable to retrieve router.")
exceptions.handle(self.request, msg, redirect=redirect)
@@ -83,7 +83,7 @@ class SetGatewayView(forms.ModalFormView):
router_id = self.kwargs["router_id"]
self._object = api.neutron.router_get(self.request,
router_id)
- except:
+ except Exception:
redirect = reverse(self.failure_url)
msg = _("Unable to set gateway.")
exceptions.handle(self.request, msg, redirect=redirect)
diff --git a/openstack_dashboard/dashboards/project/routers/tabs.py b/openstack_dashboard/dashboards/project/routers/tabs.py
index dceb5a26c..b390b6c59 100644
--- a/openstack_dashboard/dashboards/project/routers/tabs.py
+++ b/openstack_dashboard/dashboards/project/routers/tabs.py
@@ -32,7 +32,7 @@ class OverviewTab(tabs.Tab):
router_id = self.tab_group.kwargs['router_id']
try:
router = api.neutron.router_get(request, router_id)
- except:
+ except Exception:
exceptions.handle(self.request,
_('Unable to retrieve router details.'),
redirect=reverse(self.redirect_url))
diff --git a/openstack_dashboard/dashboards/project/routers/views.py b/openstack_dashboard/dashboards/project/routers/views.py
index a4c06f955..26936d42d 100644
--- a/openstack_dashboard/dashboards/project/routers/views.py
+++ b/openstack_dashboard/dashboards/project/routers/views.py
@@ -48,7 +48,7 @@ class IndexView(tables.DataTableView):
routers = api.neutron.router_list(self.request,
tenant_id=tenant_id,
search_opts=search_opts)
- except:
+ except Exception:
routers = []
exceptions.handle(self.request,
_('Unable to retrieve router list.'))
@@ -100,7 +100,7 @@ class DetailView(tables.MultiTableView):
router_id = self.kwargs['router_id']
router = api.neutron.router_get(self.request, router_id)
router.set_id_as_name_if_empty(length=0)
- except:
+ except Exception:
msg = _('Unable to retrieve details for router "%s".') \
% (router_id)
exceptions.handle(self.request, msg, redirect=self.failure_url)
@@ -131,7 +131,7 @@ class DetailView(tables.MultiTableView):
device_id = self.kwargs['router_id']
ports = api.neutron.port_list(self.request,
device_id=device_id)
- except:
+ except Exception:
ports = []
msg = _('Port list can not be retrieved.')
exceptions.handle(self.request, msg)