https://hg.python.org/cpython/rev/ce57a74b5223 changeset: 104187:ce57a74b5223 branch: 2.7 parent: 104178:7cea3bf44acb user: Terry Jan Reedy <tjreedy@udel.edu> date: Fri Sep 30 15:38:41 2016 -0400 summary: Issue #28815: Change '?' to '<module>' in some doc examples. Patch by Mariatta Wijaya. files: Doc/tutorial/errors.rst | 18 +++++++++--------- Misc/ACKS | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -18,7 +18,7 @@ complaint you get while you are still learning Python:: >>> while True print 'Hello world' - File "<stdin>", line 1, in ? + File "<stdin>", line 1 while True print 'Hello world' ^ SyntaxError: invalid syntax @@ -44,15 +44,15 @@ >>> 10 * (1/0) Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> ZeroDivisionError: integer division or modulo by zero >>> 4 + spam*3 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: name 'spam' is not defined >>> '2' + 2 Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> TypeError: cannot concatenate 'str' and 'int' objects The last line of the error message indicates what happened. Exceptions come in @@ -223,7 +223,7 @@ >>> raise NameError('HiThere') Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> NameError: HiThere The sole argument to :keyword:`raise` indicates the exception to be raised. @@ -242,7 +242,7 @@ ... An exception flew by! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> NameError: HiThere @@ -270,7 +270,7 @@ My exception occurred, value: 4 >>> raise MyError('oops!') Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> __main__.MyError: 'oops!' In this example, the default :meth:`__init__` of :class:`Exception` has been @@ -339,7 +339,7 @@ ... Goodbye, world! Traceback (most recent call last): - File "<stdin>", line 2, in ? + File "<stdin>", line 2, in <module> KeyboardInterrupt A *finally clause* is always executed before leaving the :keyword:`try` @@ -372,7 +372,7 @@ >>> divide("2", "1") executing finally clause Traceback (most recent call last): - File "<stdin>", line 1, in ? + File "<stdin>", line 1, in <module> File "<stdin>", line 3, in divide TypeError: unsupported operand type(s) for /: 'str' and 'str' diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1494,6 +1494,7 @@ Felix Wiemann Gerry Wiener Frank Wierzbicki +Mariatta Wijaya Santoso Wijaya Bryce "Zooko" Wilcox-O'Hearn Timothy Wild -- Repository URL: https://hg.python.org/cpython