[Python-checkins] [3.11] [doc] Update example in traceback doc (GH-96600) (GH-96603)

Mon Sep 5 17:43:32 EDT 2022

https://github.com/python/cpython/commit/a5a9d0517b50ac328f02cb3778df717cca7020a9
commit: a5a9d0517b50ac328f02cb3778df717cca7020a9
branch: 3.11
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2022年09月05日T22:43:27+01:00
summary:
[3.11] [doc] Update example in traceback doc (GH-96600) (GH-96603)
This Monty Python reference is of-its-time. It could seem inappropriate in the context of today's sensibilities around mental health.
Automerge-Triggered-By: GH:iritkatriel
(cherry picked from commit c4999f261fb0cb28ef713b48ef2e81ca5a3eb1e1)
Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
files:
M Doc/library/traceback.rst

diff --git a/Doc/library/traceback.rst b/Doc/library/traceback.rst
index a8412cc93d1..2f253dff1de 100644
--- a/Doc/library/traceback.rst
+++ b/Doc/library/traceback.rst
@@ -425,9 +425,9 @@ exception and traceback:
 import sys, traceback
 
 def lumberjack():
- bright_side_of_death()
+ bright_side_of_life()
 
- def bright_side_of_death():
+ def bright_side_of_life():
 return tuple()[0]
 
 try:
@@ -437,9 +437,7 @@ exception and traceback:
 print("*** print_tb:")
 traceback.print_tb(exc_traceback, limit=1, file=sys.stdout)
 print("*** print_exception:")
- # exc_type below is ignored on 3.5 and later
- traceback.print_exception(exc_type, exc_value, exc_traceback,
- limit=2, file=sys.stdout)
+ traceback.print_exception(exc_value, limit=2, file=sys.stdout)
 print("*** print_exc:")
 traceback.print_exc(limit=2, file=sys.stdout)
 print("*** format_exc, first and last line:")
@@ -447,9 +445,7 @@ exception and traceback:
 print(formatted_lines[0])
 print(formatted_lines[-1])
 print("*** format_exception:")
- # exc_type below is ignored on 3.5 and later
- print(repr(traceback.format_exception(exc_type, exc_value,
- exc_traceback)))
+ print(repr(traceback.format_exception(exc_value)))
 print("*** extract_tb:")
 print(repr(traceback.extract_tb(exc_traceback)))
 print("*** format_tb:")
@@ -469,14 +465,14 @@ The output for the example would look similar to this:
 File "<doctest...>", line 10, in <module>
 lumberjack()
 File "<doctest...>", line 4, in lumberjack
- bright_side_of_death()
+ bright_side_of_life()
 IndexError: tuple index out of range
 *** print_exc:
 Traceback (most recent call last):
 File "<doctest...>", line 10, in <module>
 lumberjack()
 File "<doctest...>", line 4, in lumberjack
- bright_side_of_death()
+ bright_side_of_life()
 IndexError: tuple index out of range
 *** format_exc, first and last line:
 Traceback (most recent call last):
@@ -484,17 +480,17 @@ The output for the example would look similar to this:
 *** format_exception:
 ['Traceback (most recent call last):\n',
 ' File "<doctest default[0]>", line 10, in <module>\n lumberjack()\n',
- ' File "<doctest default[0]>", line 4, in lumberjack\n bright_side_of_death()\n',
- ' File "<doctest default[0]>", line 7, in bright_side_of_death\n return tuple()[0]\n ~~~~~~~^^^\n',
+ ' File "<doctest default[0]>", line 4, in lumberjack\n bright_side_of_life()\n',
+ ' File "<doctest default[0]>", line 7, in bright_side_of_life\n return tuple()[0]\n ~~~~~~~^^^\n',
 'IndexError: tuple index out of range\n']
 *** extract_tb:
 [<FrameSummary file <doctest...>, line 10 in <module>>,
 <FrameSummary file <doctest...>, line 4 in lumberjack>,
- <FrameSummary file <doctest...>, line 7 in bright_side_of_death>]
+ <FrameSummary file <doctest...>, line 7 in bright_side_of_life>]
 *** format_tb:
 [' File "<doctest default[0]>", line 10, in <module>\n lumberjack()\n',
- ' File "<doctest default[0]>", line 4, in lumberjack\n bright_side_of_death()\n',
- ' File "<doctest default[0]>", line 7, in bright_side_of_death\n return tuple()[0]\n ~~~~~~~^^^\n']
+ ' File "<doctest default[0]>", line 4, in lumberjack\n bright_side_of_life()\n',
+ ' File "<doctest default[0]>", line 7, in bright_side_of_life\n return tuple()[0]\n ~~~~~~~^^^\n']
 *** tb_lineno: 10
 
 
