Use sys.exc_info() where needed.

This commit is contained in:
Guido van Rossum 1997-09-29 23:22:12 +00:00
parent c90ad2103e
commit f15d15964b
9 changed files with 38 additions and 32 deletions

View File

@ -148,7 +148,7 @@ class Bdb: # Basic Debugger
try:
1 + ''
except:
frame = sys.exc_traceback.tb_frame.f_back
frame = sys.exc_info()[2].tb_frame.f_back
self.reset()
while frame:
frame.f_trace = self.trace_dispatch
@ -168,7 +168,7 @@ class Bdb: # Basic Debugger
try:
1 + '' # raise an exception
except:
frame = sys.exc_traceback.tb_frame.f_back
frame = sys.exc_info()[2].tb_frame.f_back
while frame and frame is not self.botframe:
del frame.f_trace
frame = frame.f_back

View File

@ -1210,7 +1210,7 @@ def test(environ=os.environ):
def print_exception(type=None, value=None, tb=None, limit=None):
if type is None:
type, value, tb = sys.exc_type, sys.exc_value, sys.exc_traceback
type, value, tb = sys.exc_info()
import traceback
print
print "<H3>Traceback (innermost last):</H3>"
@ -1220,6 +1220,7 @@ def print_exception(type=None, value=None, tb=None, limit=None):
escape(string.join(list[:-1], "")),
escape(list[-1]),
)
del tb
def print_environ(environ=os.environ):
"""Dump the shell environment as HTML."""

View File

@ -74,13 +74,14 @@ def browserexec(tb, cmd):
try:
exec cmd+'\n' in globals, locals
except:
t, v = sys.exc_info()[:2]
print '*** Exception:',
if type(sys.exc_type) == type(''):
print sys.exc_type,
if type(t) == type(''):
print t,
else:
print sys.exc_type.__name__,
if sys.exc_value <> None:
print ':', sys.exc_value,
print t.__name__,
if v <> None:
print ':', v,
print
print 'Type help to get help.'

View File

@ -379,7 +379,7 @@ class Folder:
if not seqs.has_key(head):
if not msg:
msg = "bad message list %s" % seq
raise Error, msg, sys.exc_traceback
raise Error, msg, sys.exc_info()[2]
msgs = seqs[head]
if not msgs:
raise Error, "sequence %s empty" % head

View File

@ -412,8 +412,7 @@ def test():
try:
testproper()
except:
sys.last_type, sys.last_value, sys.last_traceback = (
sys.exc_type, sys.exc_value, sys.exc_traceback)
sys.last_type, sys.last_value, sys.last_traceback = sys.exc_info()
print
print sys.last_type, ':', sys.last_value
print

View File

@ -412,8 +412,7 @@ def test():
try:
testproper()
except:
sys.last_type, sys.last_value, sys.last_traceback = (
sys.exc_type, sys.exc_value, sys.exc_traceback)
sys.last_type, sys.last_value, sys.last_traceback = sys.exc_info()
print
print sys.last_type, ':', sys.last_value
print

View File

@ -80,10 +80,11 @@ class Pdb(bdb.Bdb, cmd.Cmd):
code = compile(line + '\n', '<stdin>', 'single')
exec code in globals, locals
except:
if type(sys.exc_type) == type(''):
exc_type_name = sys.exc_type
else: exc_type_name = sys.exc_type.__name__
print '***', exc_type_name + ':', sys.exc_value
t, v = sys.exc_info()[:2]
if type(t) == type(''):
exc_type_name = t
else: exc_type_name = t.__name__
print '***', exc_type_name + ':', v
# Command definitions, called by cmdloop()
# The argument is the remaining string on the command line
@ -219,10 +220,11 @@ class Pdb(bdb.Bdb, cmd.Cmd):
value = eval(arg, self.curframe.f_globals, \
self.curframe.f_locals)
except:
if type(sys.exc_type) == type(''):
exc_type_name = sys.exc_type
else: exc_type_name = sys.exc_type.__name__
print '***', exc_type_name + ':', `sys.exc_value`
t, v = sys.exc_info()[:2]
if type(t) == type(''):
exc_type_name = t
else: exc_type_name = t.__name__
print '***', exc_type_name + ':', `v`
return
print `value`
@ -277,10 +279,11 @@ class Pdb(bdb.Bdb, cmd.Cmd):
value = eval(arg, self.curframe.f_globals, \
self.curframe.f_locals)
except:
if type(sys.exc_type) == type(''):
exc_type_name = sys.exc_type
else: exc_type_name = sys.exc_type.__name__
print '***', exc_type_name + ':', `sys.exc_value`
t, v = sys.exc_info()[:2]
if type(t) == type(''):
exc_type_name = t
else: exc_type_name = t.__name__
print '***', exc_type_name + ':', `v`
return
code = None
# Is it a function?

View File

@ -74,13 +74,14 @@ def browserexec(tb, cmd):
try:
exec cmd+'\n' in globals, locals
except:
t, v = sys.exc_info()[:2]
print '*** Exception:',
if type(sys.exc_type) == type(''):
print sys.exc_type,
if type(t) == type(''):
print t,
else:
print sys.exc_type.__name__,
if sys.exc_value <> None:
print ':', sys.exc_value,
print t.__name__,
if v <> None:
print ':', v,
print
print 'Type help to get help.'

View File

@ -51,10 +51,12 @@ try:
raise TypeError
except TypeError:
try:
TracebackType = type(sys.exc_traceback)
FrameType = type(sys.exc_traceback.tb_frame)
tb = sys.exc_info()[2]
TracebackType = type(tb)
FrameType = type(tb.tb_frame)
except:
pass
tb = None; del tb
SliceType = type(slice(0))
EllipsisType = type(Ellipsis)