#16154: fix some doctests in Doc/library. Patch by Ravi Sinha.

diff --git a/Doc/library/colorsys.rst b/Doc/library/colorsys.rst
index dbab7063e106fbda0e19f0b2d2d689ab9d217285..225306c2d3a6b6e8ed28a00a631b0374e110c39c 100644 (file)
--- a/Doc/library/colorsys.rst
+++ b/Doc/library/colorsys.rst
@@ -58,7 +58,7 @@ The :mod:`colorsys` module defines the following functions:
 Example::
 
    >>> import colorsys
-   >>> colorsys.rgb_to_hsv(.3, .4, .2)
-   (0.25, 0.5, 0.4)
-   >>> colorsys.hsv_to_rgb(0.25, 0.5, 0.4)
-   (0.3, 0.4, 0.2)
+   >>> colorsys.rgb_to_hsv(0.2, 0.4, 0.4)
+   (0.5, 0.5, 0.4)
+   >>> colorsys.hsv_to_rgb(0.5, 0.5, 0.4)
+   (0.2, 0.4, 0.4)

diff --git a/Doc/library/filecmp.rst b/Doc/library/filecmp.rst
index 6881969c2a154021927418612f8299f9b747b58b..f9c5fb16a3049e0e5f49fd0da980a4eb50107ff8 100644 (file)
--- a/Doc/library/filecmp.rst
+++ b/Doc/library/filecmp.rst
@@ -54,9 +54,9 @@ The :mod:`filecmp` module defines the following functions:
 Example::
 
    >>> import filecmp
-   >>> filecmp.cmp('undoc.rst', 'undoc.rst')
+   >>> filecmp.cmp('undoc.rst', 'undoc.rst') # doctest: +SKIP
    True
-   >>> filecmp.cmp('undoc.rst', 'index.rst')
+   >>> filecmp.cmp('undoc.rst', 'index.rst') # doctest: +SKIP
    False
 
 
@@ -190,6 +190,6 @@ recursively through two directories to show common different files::
     ...     for sub_dcmp in dcmp.subdirs.values():
     ...         print_diff_files(sub_dcmp)
     ...
-    >>> dcmp = dircmp('dir1', 'dir2')
-    >>> print_diff_files(dcmp)
+    >>> dcmp = dircmp('dir1', 'dir2') # doctest: +SKIP
+    >>> print_diff_files(dcmp) # doctest: +SKIP
 

diff --git a/Doc/library/math.rst b/Doc/library/math.rst
index e5ffba0d2cc918f706b3bc896708fa2c2678e1ac..57d776243523feeedb0fd7c245398ab79ed77fb0 100644 (file)
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -82,6 +82,8 @@ Number-theoretic and representation functions
 
 
 .. function:: fsum(iterable)
+.. testsetup::
+        >>> from math import fsum
 
    Return an accurate floating point sum of values in the iterable.  Avoids
    loss of precision by tracking multiple intermediate partial sums::

diff --git a/Doc/library/string.rst b/Doc/library/string.rst
index 9c7509bb4cb3dccce3ed4e4762f22cf86017aed1..a55c6b072875b8888777d71091bb60694f672f28 100644 (file)
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -717,7 +717,7 @@ Here is an example of how to use a Template:
    >>> Template('Give $who $100').substitute(d)
    Traceback (most recent call last):
    [...]
-   ValueError: Invalid placeholder in string: line 1, col 10
+   ValueError: Invalid placeholder in string: line 1, col 11
    >>> Template('$who likes $what').substitute(d)
    Traceback (most recent call last):
    [...]

diff --git a/Misc/ACKS b/Misc/ACKS
index c1856892276b20cab897c0e993f5a682e3322871..6c1ce6822b0c01b31d9565952bfa6536fe13542b 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -923,6 +923,7 @@ Michael Simcich
 Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
+Ravi Sinha
 Janne Sinkkonen
 Ng Pheng Siong
 George Sipe