[Python-checkins] r61744 - in python/trunk/Doc: howto/functional.rst library/decimal.rst library/re.rst
georg.brandl
python-checkins at python.org
Sat Mar 22 14:07:06 CET 2008
Author: georg.brandl
Date: Sat Mar 22 14:07:06 2008
New Revision: 61744
Modified:
python/trunk/Doc/howto/functional.rst
python/trunk/Doc/library/decimal.rst
python/trunk/Doc/library/re.rst
Log:
No need to specify explicit "doctest_block" anymore.
Modified: python/trunk/Doc/howto/functional.rst
==============================================================================
--- python/trunk/Doc/howto/functional.rst (original)
+++ python/trunk/Doc/howto/functional.rst Sat Mar 22 14:07:06 2008
@@ -450,7 +450,7 @@
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 @@
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
Modified: python/trunk/Doc/library/decimal.rst
==============================================================================
--- python/trunk/Doc/library/decimal.rst (original)
+++ python/trunk/Doc/library/decimal.rst Sat Mar 22 14:07:06 2008
@@ -175,12 +175,15 @@
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 @@
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 @@
except Inexact:
ctx.prec += 1
-.. doctest:: doctest_block
+.. doctest::
>>> float_to_decimal(math.pi)
Decimal('3.141592653589793115997963468544185161590576171875')
Modified: python/trunk/Doc/library/re.rst
==============================================================================
--- python/trunk/Doc/library/re.rst (original)
+++ python/trunk/Doc/library/re.rst Sat Mar 22 14:07:06 2008
@@ -938,7 +938,7 @@
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 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 @@
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 @@
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 @@
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]
More information about the Python-checkins
mailing list