[Python-3000-checkins] r62064 - in python/branches/py3k: Lib/bdb.py
martin.v.loewis
python-3000-checkins at python.org
Sun Mar 30 22:43:50 CEST 2008
Author: martin.v.loewis
Date: Sun Mar 30 22:43:50 2008
New Revision: 62064
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/bdb.py
Log:
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
........
Modified: python/branches/py3k/Lib/bdb.py
==============================================================================
--- python/branches/py3k/Lib/bdb.py (original)
+++ python/branches/py3k/Lib/bdb.py Sun Mar 30 22:43:50 2008
@@ -361,10 +361,9 @@
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 @@
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 @@
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)
More information about the Python-3000-checkins
mailing list