From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 23 Mar 2009 20:47:59 +0000 (+0000)
Subject: fix very old names for exception terms #5543
X-Git-Tag: v2.7a1~1816
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85e1478ca412f93e584046b44633283f6241df84;p=python

fix very old names for exception terms #5543
---

diff --git a/Lib/traceback.py b/Lib/traceback.py
index 3d877ee150..381fb1f434 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -149,7 +149,7 @@ def format_exception_only(etype, value):
     """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 format_exc(limit=None):
 
 
 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):