diff options
| author | Ned Batchelder <nedbat@gmail.com> | 2016-12-18 21:31:51 -0500 |
|---|---|---|
| committer | Ned Batchelder <nedbat@gmail.com> | 2016-12-18 21:31:51 -0500 |
| commit | 7c24b8bbfbfeb0d15d48157f70de7138d6e7c9da (patch) | |
| tree | ce60b053a45d127e115480527c6a862b2b56c1b9 /coverage/parser.py | |
| parent | 169075b32881c485bf464787ada86d1ed420a62d (diff) | |
| parent | b8eaf57399f82872cb7b371bc5b8ff2e9679a9ba (diff) | |
| download | python-coveragepy-git-7c24b8bbfbfeb0d15d48157f70de7138d6e7c9da.tar.gz | |
Merged in dachary/coverage.py/issue-493-2 (pull request #108)
finally happens before return in a try #493
Diffstat (limited to 'coverage/parser.py')
| -rw-r--r-- | coverage/parser.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/coverage/parser.py b/coverage/parser.py index aa2dcef8..e75694f9 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -879,19 +879,21 @@ class AstArcAnalyzer(object): try_block.return_from # or a `return`. ) - exits = self.add_body_arcs(node.finalbody, prev_starts=final_from) + final_exits = self.add_body_arcs(node.finalbody, prev_starts=final_from) if try_block.break_from: - break_exits = self._combine_finally_starts(try_block.break_from, exits) + break_exits = self._combine_finally_starts(try_block.break_from, final_exits) self.process_break_exits(break_exits) if try_block.continue_from: - continue_exits = self._combine_finally_starts(try_block.continue_from, exits) + continue_exits = self._combine_finally_starts(try_block.continue_from, final_exits) self.process_continue_exits(continue_exits) if try_block.raise_from: - raise_exits = self._combine_finally_starts(try_block.raise_from, exits) + raise_exits = self._combine_finally_starts(try_block.raise_from, final_exits) self.process_raise_exits(raise_exits) if try_block.return_from: - return_exits = self._combine_finally_starts(try_block.return_from, exits) + return_exits = self._combine_finally_starts(try_block.return_from, final_exits) self.process_return_exits(return_exits) + if exits: + exits = final_exits return exits |