From ede8ffba9659233ffae1aba1d5cf2f797875a2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 30 Mar 2008 20:43:50 +0000 Subject: Merged revisions 62018 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ 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 ........ --- Lib/bdb.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/Lib/bdb.py b/Lib/bdb.py index f0891f1..e55031e 100644 --- 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) -- cgit v0.12