From ff3b97a0b4f7ca264f7b7897cc101521485cdff8 Mon Sep 17 00:00:00 2001 From: loic Date: Sun, 18 Dec 2016 01:56:31 +0100 Subject: finally happens before return in a try #493 In a try block such as: if expr: try: return finally print pass the print happens before the return and cannot be followed by pass. The general case is that when the body/else/handlers in a try block all have return, break etc., the code behind finally: has no arc to the statement following the try block. close #493 --- coverage/parser.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'coverage/parser.py') diff --git a/coverage/parser.py b/coverage/parser.py index 71334b6..3d46bfa 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -842,19 +842,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 -- cgit v1.2.1