#2498 modernized try, except, finally statements in bdb

This commit is contained in:
Benjamin Peterson 2008-03-28 20:56:00 +00:00
parent 69b747b735
commit 41cf50d613

View file

@ -362,10 +362,9 @@ class Bdb:
if not isinstance(cmd, types.CodeType): if not isinstance(cmd, types.CodeType):
cmd = cmd+'\n' cmd = cmd+'\n'
try: try:
try: exec cmd in globals, locals
exec cmd in globals, locals except BdbQuit:
except BdbQuit: pass
pass
finally: finally:
self.quitting = 1 self.quitting = 1
sys.settrace(None) sys.settrace(None)
@ -381,10 +380,9 @@ class Bdb:
if not isinstance(expr, types.CodeType): if not isinstance(expr, types.CodeType):
expr = expr+'\n' expr = expr+'\n'
try: try:
try: return eval(expr, globals, locals)
return eval(expr, globals, locals) except BdbQuit:
except BdbQuit: pass
pass
finally: finally:
self.quitting = 1 self.quitting = 1
sys.settrace(None) sys.settrace(None)
@ -400,10 +398,9 @@ class Bdb:
sys.settrace(self.trace_dispatch) sys.settrace(self.trace_dispatch)
res = None res = None
try: try:
try: res = func(*args, **kwds)
res = func(*args, **kwds) except BdbQuit:
except BdbQuit: pass
pass
finally: finally:
self.quitting = 1 self.quitting = 1
sys.settrace(None) sys.settrace(None)