Commit ede8ffba authored by Martin v. Löwis's avatar Martin v. Löwis

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
........
parent a3ab99dc
...@@ -360,7 +360,6 @@ class Bdb: ...@@ -360,7 +360,6 @@ class Bdb:
sys.settrace(self.trace_dispatch) sys.settrace(self.trace_dispatch)
if not isinstance(cmd, types.CodeType): if not isinstance(cmd, types.CodeType):
cmd = cmd+'\n' cmd = cmd+'\n'
try:
try: try:
exec(cmd, globals, locals) exec(cmd, globals, locals)
except BdbQuit: except BdbQuit:
...@@ -379,7 +378,6 @@ class Bdb: ...@@ -379,7 +378,6 @@ class Bdb:
sys.settrace(self.trace_dispatch) sys.settrace(self.trace_dispatch)
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:
...@@ -398,7 +396,6 @@ class Bdb: ...@@ -398,7 +396,6 @@ class Bdb:
self.reset() self.reset()
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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment