summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-10-10 08:36:43 -0700
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-10-10 08:36:43 -0700
commitdb8570349e3a3d02e3fe4300232c3b1ecd9c8259 (patch)
tree861f31978029acea0dac925313e3e0de873b5832
parentecb02d62e0f1dcc12e2f12caecf9b2a21648af86 (diff)
parent3fa8c59024418e904abd4394b5ec47642f076ae3 (diff)
downloadcpython-git-db8570349e3a3d02e3fe4300232c3b1ecd9c8259.tar.gz
Issue #12947: Merge doctest documentation change from 3.3.
-rw-r--r--Doc/library/doctest.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index 8f8e5446ca..222c719528 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -552,11 +552,11 @@ doctest decides whether actual output matches an example's expected output:
both of these variations will work with the flag specified, regardless of
whether the test is run under Python 2.7 or Python 3.2 (or later versions)::
- >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL
+ >>> raise CustomError('message')
Traceback (most recent call last):
CustomError: message
- >>> raise CustomError('message') #doctest: +IGNORE_EXCEPTION_DETAIL
+ >>> raise CustomError('message')
Traceback (most recent call last):
my_module.CustomError: message
@@ -569,7 +569,7 @@ doctest decides whether actual output matches an example's expected output:
earlier (those releases do not support :ref:`doctest directives
<doctest-directives>` and ignore them as irrelevant comments). For example::
- >>> (1, 2)[3] = 'moo' #doctest: +IGNORE_EXCEPTION_DETAIL
+ >>> (1, 2)[3] = 'moo'
Traceback (most recent call last):
File "<stdin>", line 1, in ?
TypeError: object doesn't support item assignment