No need to specify explicit "doctest_block" anymore.

diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index 2424c6fa129de1829efee86eb81b3b6025c824a5..792344dac2cf75be20f82b0155125babb828f3ae 100644 (file)
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -450,7 +450,7 @@ is what generators provide; they can be thought of as resumable functions.
 
 Here's the simplest example of a generator function:
 
-.. testcode:: doctest_block
+.. testcode::
 
     def generate_ints(N):
         for i in range(N):
@@ -560,7 +560,7 @@ returns ``None``.
 Here's a simple counter that increments by 1 and allows changing the value of
 the internal counter.
 
-.. testcode:: doctest_block
+.. testcode::
 
     def counter (maximum):
         i = 0

diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index dbdb4bddfedea3f27a984f97f04a871c7ebc247b..a79272f5e41225aeab2f3609585bd5f0d128bd7e 100644 (file)
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -175,12 +175,15 @@ operations.
 Decimals interact well with much of the rest of Python.  Here is a small decimal
 floating point flying circus:
 
+.. doctest::
+   :options: +NORMALIZE_WHITESPACE
+
    >>> data = map(Decimal, '1.34 1.87 3.45 2.35 1.00 0.03 9.25'.split())
    >>> max(data)
    Decimal('9.25')
    >>> min(data)
    Decimal('0.03')
-   >>> sorted(data)  # doctest: +NORMALIZE_WHITESPACE
+   >>> sorted(data)
    [Decimal('0.03'), Decimal('1.00'), Decimal('1.34'), Decimal('1.87'),
     Decimal('2.35'), Decimal('3.45'), Decimal('9.25')]
    >>> sum(data)
@@ -1646,7 +1649,7 @@ A. Yes, all binary floating point numbers can be exactly expressed as a
 Decimal.  An exact conversion may take more precision than intuition would
 suggest, so we trap :const:`Inexact` to signal a need for more precision:
 
-.. testcode:: doctest_block
+.. testcode::
 
     def float_to_decimal(f):
         "Convert a floating point number to a Decimal with no loss of information"
@@ -1659,7 +1662,7 @@ suggest, so we trap :const:`Inexact` to signal a need for more precision:
                 except Inexact:
                     ctx.prec += 1
 
-.. doctest:: doctest_block
+.. doctest::
 
     >>> float_to_decimal(math.pi)
     Decimal('3.141592653589793115997963468544185161590576171875')

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 295dbfb2b028ff2c1d8ce8407911a844c76cc40c..2fb93ac5ebec0f36a13532d50820e0b476042c06 100644 (file)
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -938,7 +938,7 @@ Checking For a Pair
 In this example, we'll use the following helper function to display match
 objects a little more gracefully:
 
-.. testcode:: doctest_block
+.. testcode::
 
    def displaymatch(match):
        if match is None:
@@ -973,7 +973,7 @@ To match this with a regular expression, one could use backreferences as such:
 To find out what card the pair consists of, one could use the :func:`group`
 method of :class:`MatchObject` in the following manner:
 
-.. doctest:: doctest_block
+.. doctest::
 
    >>> pair.match("717ak").group(1)
    '7'
@@ -1112,7 +1112,7 @@ triple-quoted string syntax:
 The entries are separated by one or more newlines. Now we convert the string
 into a list with each nonempty line having its own entry:
 
-.. doctest:: doctest_block
+.. doctest::
    :options: +NORMALIZE_WHITESPACE
 
    >>> entries = re.split("\n+", input)
@@ -1126,7 +1126,7 @@ Finally, split each entry into a list with first name, last name, telephone
 number, and address.  We use the ``maxsplit`` parameter of :func:`split`
 because the address has spaces, our splitting pattern, in it:
 
-.. doctest:: doctest_block
+.. doctest::
    :options: +NORMALIZE_WHITESPACE
 
    >>> [re.split(":? ", entry, 3) for entry in entries]
@@ -1139,7 +1139,7 @@ The ``:?`` pattern matches the colon after the last name, so that it does not
 occur in the result list.  With a ``maxsplit`` of ``4``, we could separate the
 house number from the street name:
 
-.. doctest:: doctest_block
+.. doctest::
    :options: +NORMALIZE_WHITESPACE
 
    >>> [re.split(":? ", entry, 4) for entry in entries]