[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/9eaa3e28e514
changeset:   86352:9eaa3e28e514
parent:      86349:42f0c474ec84
parent:      86351:dcded8c7af89
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 13 23:34:06 2013 +0200
summary:
  merge with 3.3

files:
  Lib/traceback.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/traceback.py b/Lib/traceback.py
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -89,7 +89,7 @@
     print_list(extract_tb(tb, limit=limit), file=file)
 
 def format_tb(tb, limit=None):
-    """A shorthand for 'format_list(extract_tb(tb, limit))."""
+    """A shorthand for 'format_list(extract_tb(tb, limit))'."""
     return format_list(extract_tb(tb, limit=limit))
 
 def extract_tb(tb, limit=None):

-- 
Repository URL: http://hg.python.org/cpython