commit dc8cb3d08f92c246a62d88d6c4132571fef76573
author Senthil Kumaran <senthil@uthcode.com> Tue May 01 10:46:59 2012 +0800
committer Senthil Kumaran <senthil@uthcode.com> Tue May 01 10:46:59 2012 +0800
tree e184cc0e6187d1c266bfa84fdea00a12f9b5ada5
parent 7f6d4e1926a01b88be13343a82e849a90acf56e3

Have Bdb frame_returning in the finally clause

Lib/bdb.py

diff --git a/Lib/bdb.py b/Lib/bdb.py
index 1a562f4..59440a9 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -83,9 +83,11 @@
 
     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