summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2016-08-10 05:35:51 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2016-08-10 05:35:51 (GMT)
commitef28f6ad82db18e506d01b60307e006229eb676f (patch)
tree3456aff584250e802371355a0732f72bac9ae4e3
parent75bc032341692623f3d13ee24718f45a8d51307f (diff)
parentc90fccdff6f5e72f1e4ff09ba1ba7697f70b0f4b (diff)
downloadcpython-ef28f6ad82db18e506d01b60307e006229eb676f.zip
cpython-ef28f6ad82db18e506d01b60307e006229eb676f.tar.gz
cpython-ef28f6ad82db18e506d01b60307e006229eb676f.tar.bz2
Closes #27208: Merge with 3.5
-rw-r--r--Doc/library/traceback.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst
index 6ec9ada..3c1d9bb 100644
--- a/Doc/library/traceback.rst
+++ b/Doc/library/traceback.rst
@@ -361,7 +361,7 @@ exception and traceback:
traceback.print_exception(exc_type, exc_value, exc_traceback,
limit=2, file=sys.stdout)
print("*** print_exc:")
- traceback.print_exc()
+ traceback.print_exc(limit=2, file=sys.stdout)
print("*** format_exc, first and last line:")
formatted_lines = traceback.format_exc().splitlines()
print(formatted_lines[0])
@@ -407,9 +407,9 @@ The output for the example would look similar to this:
' File "<doctest...>", line 7, in bright_side_of_death\n return tuple()[0]\n',
'IndexError: tuple index out of range\n']
*** extract_tb:
- [('<doctest...>', 10, '<module>', 'lumberjack()'),
- ('<doctest...>', 4, 'lumberjack', 'bright_side_of_death()'),
- ('<doctest...>', 7, 'bright_side_of_death', 'return tuple()[0]')]
+ [<FrameSummary file <doctest...>, line 10 in <module>>,
+ <FrameSummary file <doctest...>, line 4 in lumberjack>,
+ <FrameSummary file <doctest...>, line 7 in bright_side_of_death>]
*** format_tb:
[' File "<doctest...>", line 10, in <module>\n lumberjack()\n',
' File "<doctest...>", line 4, in lumberjack\n bright_side_of_death()\n',