openstack
/
neutron
Code Issues Proposed changes

Merge "Remove unused 'as e' in exception blocks"

This commit is contained in:
Jenkins 2014-03-04 03:57:24 +00:00 committed by Gerrit Code Review
parent 7978c6c7c6 aa5ace6b75
commit 3e1799d046
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/api/v2/resource.py
View File

@ -124,7 +124,7 @@ def Resource(controller, faults=None, deserializers=None, serializers=None):
{'NotImplementedError': e.message})
kwargs = {'body': body, 'content_type': content_type}
raise webob.exc.HTTPNotImplemented(**kwargs)
except Exception as e:
except Exception:
# NOTE(jkoelker) Everything else is 500
LOG.exception(_('%s failed'), action)
# Do not expose details of 500 error to clients.

2
neutron/plugins/vmware/nsxlib/router.py
View File

@ -591,7 +591,7 @@ def update_lrouter_port_ips(cluster, lrouter_id, lport_id,
# Set is not JSON serializable - convert to list
port['ip_addresses'] = list(ip_address_set)
do_request(HTTP_PUT, uri, jsonutils.dumps(port), cluster=cluster)
except exception.NotFound as e:
except exception.NotFound:
# FIXME(salv-orlando):avoid raising different exception
data = {'lport_id': lport_id, 'lrouter_id': lrouter_id}
msg = (_("Router Port %(lport_id)s not found on router "