From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 1 May 2012 02:46:59 +0000 (+0800)
Subject: Have Bdb frame_returning in the finally clause
X-Git-Tag: v2.7.4rc1~861
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc8cb3d08f92c246a62d88d6c4132571fef76573;p=thirdparty%2FPython%2Fcpython.git

Have Bdb frame_returning in the finally clause
---

diff --git a/Lib/bdb.py b/Lib/bdb.py
index 1a562f47b0ff..59440a99a0fa 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -83,9 +83,11 @@ class Bdb:
 
     def dispatch_return(self, frame, arg):
         if self.stop_here(frame) or frame == self.returnframe:
-            self.frame_returning = frame
-            self.user_return(frame, arg)
-            self.frame_returning = None
+            try:
+                self.frame_returning = frame
+                self.user_return(frame, arg)
+            finally:
+                self.frame_returning = None
             if self.quitting: raise BdbQuit
         return self.trace_dispatch