openstack
/
heat-dashboard
Code Issues Proposed changes

Merge "Enable H201: do not write "except:""

This commit is contained in:
Jenkins 2013-08-14 07:44:23 +00:00 committed by Gerrit Code Review
parent 276a01f28e 4dea9b0b5e
commit dac0629c97
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/project/stacks/api.py
View File

@ -22,7 +22,7 @@ class Stack(object):
def d3_data(request, stack_id=''): def d3_data(request, stack_id=''):
try: try:
stack = stack_get(request, stack_id) stack = stack_get(request, stack_id)
except: except Exception:
stack = Stack() stack = Stack()
stack.id = stack_id stack.id = stack_id
stack.stack_name = request.session.get('stack_name', '') stack.stack_name = request.session.get('stack_name', '')
@ -31,7 +31,7 @@ def d3_data(request, stack_id=''):
try: try:
resources = resources_list(request, stack.stack_name) resources = resources_list(request, stack.stack_name)
except: except Exception:
resources = [] resources = []
d3_data = {"nodes": [], "stack": {}} d3_data = {"nodes": [], "stack": {}}

4
openstack_dashboard/dashboards/project/stacks/tabs.py
View File

@ -74,7 +74,7 @@ class StackEventsTab(tabs.Tab):
stack_identifier = '%s/%s' % (stack.stack_name, stack.id) stack_identifier = '%s/%s' % (stack.stack_name, stack.id)
events = api.heat.events_list(self.request, stack_identifier) events = api.heat.events_list(self.request, stack_identifier)
LOG.debug('got events %s' % events) LOG.debug('got events %s' % events)
except: except Exception:
events = [] events = []
messages.error(request, _( messages.error(request, _(
'Unable to get events for stack "%s".') % stack.stack_name) 'Unable to get events for stack "%s".') % stack.stack_name)
@ -94,7 +94,7 @@ class StackResourcesTab(tabs.Tab):
stack_identifier = '%s/%s' % (stack.stack_name, stack.id) stack_identifier = '%s/%s' % (stack.stack_name, stack.id)
resources = api.heat.resources_list(self.request, stack_identifier) resources = api.heat.resources_list(self.request, stack_identifier)
LOG.debug('got resources %s' % resources) LOG.debug('got resources %s' % resources)
except: except Exception:
resources = [] resources = []
messages.error(request, _( messages.error(request, _(
'Unable to get resources for stack "%s".') % stack.stack_name) 'Unable to get resources for stack "%s".') % stack.stack_name)

8
openstack_dashboard/dashboards/project/stacks/views.py
View File

@ -48,7 +48,7 @@ class IndexView(tables.DataTableView):
request = self.request request = self.request
try: try:
stacks = api.heat.stacks_list(self.request) stacks = api.heat.stacks_list(self.request)
except: except Exception:
exceptions.handle(request, _('Unable to retrieve stack list.')) exceptions.handle(request, _('Unable to retrieve stack list.'))
stacks = [] stacks = []
return stacks return stacks
@ -107,7 +107,7 @@ class DetailView(tabs.TabView):
self._stack = stack self._stack = stack
request.session['stack_id'] = stack.id request.session['stack_id'] = stack.id
request.session['stack_name'] = stack.stack_name request.session['stack_name'] = stack.stack_name
except: except Exception:
msg = _("Unable to retrieve stack.") msg = _("Unable to retrieve stack.")
redirect = reverse('horizon:project:stacks:index') redirect = reverse('horizon:project:stacks:index')
exceptions.handle(request, msg, redirect=redirect) exceptions.handle(request, msg, redirect=redirect)
@ -136,7 +136,7 @@ class ResourceView(tabs.TabView):
kwargs['stack_id'], kwargs['stack_id'],
kwargs['resource_name']) kwargs['resource_name'])
self._resource = resource self._resource = resource
except: except Exception:
msg = _("Unable to retrieve resource.") msg = _("Unable to retrieve resource.")
redirect = reverse('horizon:project:stacks:index') redirect = reverse('horizon:project:stacks:index')
exceptions.handle(request, msg, redirect=redirect) exceptions.handle(request, msg, redirect=redirect)
@ -150,7 +150,7 @@ class ResourceView(tabs.TabView):
kwargs['stack_id'], kwargs['stack_id'],
kwargs['resource_name']) kwargs['resource_name'])
self._metadata = json.dumps(metadata, indent=2) self._metadata = json.dumps(metadata, indent=2)
except: except Exception:
msg = _("Unable to retrieve metadata.") msg = _("Unable to retrieve metadata.")
redirect = reverse('horizon:project:stacks:index') redirect = reverse('horizon:project:stacks:index')
exceptions.handle(request, msg, redirect=redirect) exceptions.handle(request, msg, redirect=redirect)

3
tox.ini
View File

@ -39,9 +39,8 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,p
# F403 'from <smth> import *' used; unable to detect undefined names # F403 'from <smth> import *' used; unable to detect undefined names
# F999 syntax error in doctest # F999 syntax error in doctest
# H102 Apache 2.0 license header not found # H102 Apache 2.0 license header not found
# H201 no 'except:' at least use 'except Exception:'
# H302 import only modules.'from optparse import make_option' does not import a module # H302 import only modules.'from optparse import make_option' does not import a module
# H4xx docstrings # H4xx docstrings
# H701 empty localization string # H701 empty localization string
# H702 Formatting operation should be outside of localization method call # H702 Formatting operation should be outside of localization method call
ignore = E121,E126,E127,E128,F403,F999,H102,H201,H302,H4,H701,H702 ignore = E121,E126,E127,E128,F403,F999,H102,H302,H4,H701,H702