Merged revisions 62018 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62018 | benjamin.peterson | 2008-03-28 21:56:00 +0100 (Fr, 28 Mär 2008) | 2 lines

  #2498 modernized try, except, finally statments in bdb
........

diff --git a/Lib/bdb.py b/Lib/bdb.py
index f0891f1fbb4a2747298a0b1d0c4ec9a2b682e337..e55031e040cb423866079de454725800b757cf2e 100644 (file)
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -361,10 +361,9 @@ class Bdb:
         if not isinstance(cmd, types.CodeType):
             cmd = cmd+'\n'
         try:
-            try:
-                exec(cmd, globals, locals)
-            except BdbQuit:
-                pass
+            exec(cmd, globals, locals)
+        except BdbQuit:
+            pass
         finally:
             self.quitting = 1
             sys.settrace(None)
@@ -380,10 +379,9 @@ class Bdb:
         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)
@@ -399,10 +397,9 @@ class Bdb:
         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)