x
/
vmware-nsx
Code Issues Proposed changes

Remove single occurrence of lost-exception warning 

Returning within a finally block can be surprising since the finally
block will "hijack" the regular return flow.  In this case, pylint is
trying to warn us that the return-within-finally would discard the
earlier caught exception.  For this particular function we don't care
that the exception is lost, so the existing code is correct but possibly
confusing.

Our options are:
1. Disable the lost-exception warning for this function
2. Rewrite the function to avoid return-within-finally

This change takes approach (2), since the required change is trivial.

This change also enables the corresponding pylint check now that the
only offending case has been removed.

Change-Id: If1706851b4bd67ebdbbdb3485984773598efdf7a
This commit is contained in:
Angus Lees 2014-08-25 12:48:02 +10:00
parent 0c1223862c
commit fe57eb2bff
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.pylintrc
View File

@ -48,7 +48,6 @@ disable=
global-statement, global-statement,
global-variable-not-assigned, global-variable-not-assigned,
logging-not-lazy, logging-not-lazy,
lost-exception,
no-init, no-init,
non-parent-init-called, non-parent-init-called,
pointless-string-statement, pointless-string-statement,

18
neutron/api/v2/attributes.py
View File

@ -151,19 +151,17 @@ def _validate_no_whitespace(data):
def _validate_mac_address(data, valid_values=None): def _validate_mac_address(data, valid_values=None):
valid_mac = False
try: try:
valid_mac = netaddr.valid_mac(_validate_no_whitespace(data)) valid_mac = netaddr.valid_mac(_validate_no_whitespace(data))
except Exception: except Exception:
pass valid_mac = False
finally: # TODO(arosen): The code in this file should be refactored
# TODO(arosen): The code in this file should be refactored # so it catches the correct exceptions. _validate_no_whitespace
# so it catches the correct exceptions. _validate_no_whitespace # raises AttributeError if data is None.
# raises AttributeError if data is None. if not valid_mac:
if valid_mac is False: msg = _("'%s' is not a valid MAC address") % data
msg = _("'%s' is not a valid MAC address") % data LOG.debug(msg)
LOG.debug(msg) return msg
return msg
def _validate_mac_address_or_none(data, valid_values=None): def _validate_mac_address_or_none(data, valid_values=None):