[Python-checkins] r70552 - python/trunk/Lib/traceback.py

Mon Mar 23 21:47:59 CET 2009

Author: benjamin.peterson
Date: Mon Mar 23 21:47:59 2009
New Revision: 70552
Log:
fix very old names for exception terms #5543
Modified:
 python/trunk/Lib/traceback.py
Modified: python/trunk/Lib/traceback.py
==============================================================================

--- python/trunk/Lib/traceback.py	(original)
+++ python/trunk/Lib/traceback.py	Mon Mar 23 21:47:59 2009
@@ -149,7 +149,7 @@
 """Format the exception part of a traceback.
 
 The arguments are the exception type and value such as given by
- sys.last_type and sys.last_value. The return value is a list of
+ sys.exc_info()[0] and sys.exc_info()[1]. The return value is a list of
 strings, each ending in a newline.
 
 Normally, the list contains a single string; however, for
@@ -239,12 +239,12 @@
 
 
 def print_last(limit=None, file=None):
- """This is a shorthand for 'print_exception(sys.last_type,
- sys.last_value, sys.last_traceback, limit, file)'."""
+ """
+ This is a shorthand for 'print_exception(*sys.exc_info(), limit, file)'.
+ """
 if file is None:
 file = sys.stderr
- print_exception(sys.last_type, sys.last_value, sys.last_traceback,
- limit, file)
+ print_exception(*(sys.exc_info() + (limit, file)))
 
 
 def print_stack(f=None, limit=None, file=None):
