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
fe57eb2bff