[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads.

Fri Jan 11 08:13:12 CET 2013

http://hg.python.org/cpython/rev/66e2040c1756
changeset: 81396:66e2040c1756
branch: 2.7
parent: 81391:a30c36fbefcf
parent: 81395:9b3d0bdb9256
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Jan 11 09:06:12 2013 +0200
summary:
 Merge heads.
files:
 Doc/library/colorsys.rst | 8 ++++----
 Doc/library/filecmp.rst | 8 ++++----
 Doc/library/math.rst | 2 ++
 Doc/library/string.rst | 2 +-
 Misc/ACKS | 1 +
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Doc/library/colorsys.rst b/Doc/library/colorsys.rst
--- a/Doc/library/colorsys.rst
+++ b/Doc/library/colorsys.rst
@@ -58,7 +58,7 @@
 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
--- a/Doc/library/filecmp.rst
+++ b/Doc/library/filecmp.rst
@@ -54,9 +54,9 @@
 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 @@
 ... 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
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -82,6 +82,8 @@
 
 
 .. 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
--- a/Doc/library/string.rst
+++ b/Doc/library/string.rst
@@ -717,7 +717,7 @@
 >>> 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -923,6 +923,7 @@
 Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
+Ravi Sinha
 Janne Sinkkonen
 Ng Pheng Siong
 George Sipe
-- 
Repository URL: http://hg.python.org/cpython
