[Python-checkins] cpython (2.7): Issue #12947: Backport doctest documentation change from 3.3.

chris.jerdonek python-checkins at python.org
Wed Oct 10 17:40:21 CEST 2012


http://hg.python.org/cpython/rev/8704f9e7ad7c
changeset:   79649:8704f9e7ad7c
branch:      2.7
parent:      79646:328ed76d98a5
user:        Chris Jerdonek <chris.jerdonek at gmail.com>
date:        Wed Oct 10 08:39:34 2012 -0700
summary:
  Issue #12947: Backport 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
@@ -580,11 +580,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
 
@@ -597,7 +597,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


More information about the Python-checkins mailing list