[Python-checkins] r62018 - python/trunk/Lib/bdb.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Mar 28 21:56:00 2008
New Revision: 62018

Modified:
   python/trunk/Lib/bdb.py
Log:
#2498 modernized try, except, finally statments in bdb


Modified: python/trunk/Lib/bdb.py
==============================================================================
--- python/trunk/Lib/bdb.py	(original)
+++ python/trunk/Lib/bdb.py	Fri Mar 28 21:56:00 2008
@@ -362,10 +362,9 @@
         if not isinstance(cmd, types.CodeType):
             cmd = cmd+'\n'
         try:
-            try:
-                exec cmd in globals, locals
-            except BdbQuit:
-                pass
+            exec cmd in globals, locals
+        except BdbQuit:
+            pass
         finally:
             self.quitting = 1
             sys.settrace(None)
@@ -381,10 +380,9 @@
         if not isinstance(expr, types.CodeType):
             expr = expr+'\n'
         try:
-            try:
-                return eval(expr, globals, locals)
-            except BdbQuit:
-                pass
+            return eval(expr, globals, locals)
+        except BdbQuit:
+            pass
         finally:
             self.quitting = 1
             sys.settrace(None)
@@ -400,10 +398,9 @@
         sys.settrace(self.trace_dispatch)
         res = None
         try:
-            try:
-                res = func(*args, **kwds)
-            except BdbQuit:
-                pass
+            res = func(*args, **kwds)
+        except BdbQuit:
+            pass
         finally:
             self.quitting = 1
             sys.settrace(None)