[Python-checkins] cpython (merge 3.3 -> default): Issue #12947: Merge doctest documentation change from 3.3.

[chris.jerdonek]

http://hg.python.org/cpython/rev/9475fc82768e
changeset:   79648:9475fc82768e
parent:      79645:0d6910bef979
parent:      79647:705a70b0fff4
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Oct 10 08:36:43 2012 -0700
summary:
  Issue #12947: Merge doctest documentation change from 3.3.

files:
  Doc/library/doctest.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -552,11 +552,11 @@
    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 @@
    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

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