summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-01-11 08:53:10 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2013-01-11 08:53:10 +0200
commit57dfb227a3b0b00da584734510f9c831a94d08b5 (patch)
tree7d34191acae1dec021ef0028c53ee56c4cac9b01
parent5c4e32b131af335d82e467ba95d6b30a414020e8 (diff)
downloadcpython-git-57dfb227a3b0b00da584734510f9c831a94d08b5.tar.gz
#16154: fix some doctests in Doc/library. Patch by Ravi Sinha.
-rw-r--r--Doc/library/colorsys.rst8
-rw-r--r--Doc/library/filecmp.rst8
-rw-r--r--Doc/library/math.rst2
-rw-r--r--Doc/library/string.rst2
-rw-r--r--Misc/ACKS1
5 files changed, 12 insertions, 9 deletions
diff --git a/Doc/library/colorsys.rst b/Doc/library/colorsys.rst
index dbab7063e1..225306c2d3 100644
--- 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 6881969c2a..f9c5fb16a3 100644
--- 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 e5ffba0d2c..57d7762435 100644
--- 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 9c7509bb4c..a55c6b0728 100644
--- 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 c185689227..6c1ce6822b 100644
--- 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